[CalendarServer-changes] [14808] twext/trunk/twext/who

[source_changes at macosforge.org]

Revision: 14808
          http://trac.calendarserver.org//changeset/14808
Author:   cdaboo at apple.com
Date:     2015-05-20 01:37:18 -0700 (Wed, 20 May 2015)
Log Message:
-----------
Fix test failures due to hash randomization.

Modified Paths:
--------------
    twext/trunk/twext/who/test/test_expression.py
    twext/trunk/twext/who/test/test_util.py
    twext/trunk/twext/who/util.py

Modified: twext/trunk/twext/who/test/test_expression.py
===================================================================
--- twext/trunk/twext/who/test/test_expression.py	2015-05-20 03:15:33 UTC (rev 14807)
+++ twext/trunk/twext/who/test/test_expression.py	2015-05-20 08:37:18 UTC (rev 14808)
@@ -142,7 +142,7 @@
         )
         self.assertEquals(
             "<MatchExpression: u'full names' starts with u'Wilfredo' "
-            "(not|case insensitive)>",
+            "(case insensitive|not)>",
             repr(MatchExpression(
                 FieldName.fullNames,
                 u"Wilfredo",

Modified: twext/trunk/twext/who/test/test_util.py
===================================================================
--- twext/trunk/twext/who/test/test_util.py	2015-05-20 03:15:33 UTC (rev 14807)
+++ twext/trunk/twext/who/test/test_util.py	2015-05-20 08:37:18 UTC (rev 14808)
@@ -302,8 +302,8 @@
         descriptions with C{"|"}.
         """
         self.assertEquals(u"blue", describe(Switches.b))
-        self.assertEquals(u"red|green", describe(Switches.r | Switches.g))
-        self.assertEquals(u"blue|black", describe(Switches.b | Switches.black))
+        self.assertEquals(u"green|red", describe(Switches.r | Switches.g))
+        self.assertEquals(u"black|blue", describe(Switches.b | Switches.black))
 
 
     def test_describeObject(self):

Modified: twext/trunk/twext/who/util.py
===================================================================
--- twext/trunk/twext/who/util.py	2015-05-20 03:15:33 UTC (rev 14807)
+++ twext/trunk/twext/who/util.py	2015-05-20 08:37:18 UTC (rev 14808)
@@ -156,7 +156,7 @@
 def describe(constant):
     if isinstance(constant, FlagConstant):
         return "|".join(
-            getattr(flag, "description", flag.name) for flag in constant
+            sorted(getattr(flag, "description", flag.name) for flag in constant)
         )
 
     if isinstance(constant, (NamedConstant, ValueConstant)):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150520/08429dbb/attachment.html>