Ticket #5193: bug5193-3.patch

twisted/persisted/styles.py

@@ -154 +154 @@
     L{twisted.python.reflect.allYourBase} function.
 
     @param c: a class
-    @returns: list of classes
+    @returns: list of classes, in unspecified order
     """
     # begin with two classes that should *not* be included in the
     # final result

twisted/test/test_persisted.py

@@ -142 +142 @@
     """
 
     def test_aybabtu_strict_empty(self):
-        """_aybabtu of L{Versioned} itself is an empty set"""
+        """
+        _aybabtu of L{Versioned} itself is an empty list
+        """
         self.assertEqual(styles._aybabtu(styles.Versioned), [])
 
 
     def test_aybabtu_strict_subclass(self):
-        """there are no classes I{between} L{VersionedSubClass} and
-        L{Versioned}, so L{styles._aybabtu} returns an empty set"""
+        """
+        there are no classes I{between} L{VersionedSubClass} and
+        L{Versioned}, so L{styles._aybabtu} returns an empty list
+        """
         self.assertEqual(styles._aybabtu(VersionedSubClass), [])
 
 
     def test_aybabtu_subsubclass(self):
-        """With a sub-sub-class of L{Versioned}, L{styles._aybabtu} returns the
-        intervening subclass."""
+        """
+        With a sub-sub-class of L{Versioned}, L{styles._aybabtu} returns only
+        the intervening subclass.
+        """
         self.assertEqual(styles._aybabtu(VersionedSubSubClass),
             [VersionedSubClass])
 
 
     def test_aybabtu_strict(self):
-        """For a diamond-shaped inheritance graph, L{styles._aybabtu} returns
-        I{both} intermediate subclasses."""
-        self.assertEqual(styles._aybabtu(VersionedDiamondSubClass),
-            [VersionedSubSubClass, VersionedSubClass, SecondVersionedSubClass])
+        """
+        For a diamond-shaped inheritance graph, L{styles._aybabtu} returns
+        I{both} intermediate subclasses, although order is unspecified.
+        """
+        self.assertEqual(sorted(styles._aybabtu(VersionedDiamondSubClass)),
+            sorted([VersionedSubSubClass, VersionedSubClass,
+                    SecondVersionedSubClass]))