Rev 4649: Fix a few test cases that assumed topological sorting was stable. in http://bazaar.launchpad.net/~jameinel/bzr/1.19-known-graph-sorted

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.19-known-graph-sorted

------------------------------------------------------------
revno: 4649
revision-id: john at arbash-meinel.com-20090818165350-2k81ogmwr01jsnfm
parent: john at arbash-meinel.com-20090818160917-9upixnlnc1o15iin
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.19-known-graph-sorted
timestamp: Tue 2009-08-18 11:53:50 -0500
message:
  Fix a few test cases that assumed topological sorting was stable.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_ancestry.py'
--- a/bzrlib/tests/blackbox/test_ancestry.py	2009-07-31 22:48:55 +0000
+++ b/bzrlib/tests/blackbox/test_ancestry.py	2009-08-18 16:53:50 +0000
@@ -43,9 +43,15 @@
 
     def _check_ancestry(self, location='', result=None):
         out = self.run_bzr(['ancestry', location])[0]
-        if result is None:
-            result = "A1\nA2\nB1\nA3\n"
-        self.assertEqualDiff(out, result)
+        if result is not None:
+            self.assertEqualDiff(result, out)
+        else:
+            # A2 and B1 can be in either order, because they are parallel, and
+            # thus their topological order is not defined
+            result = "A1\nB1\nA2\nA3\n"
+            if result != out:
+                result = "A1\nA2\nB1\nA3\n"
+            self.assertEqualDiff(result, out)
 
     def test_ancestry(self):
         """Tests 'ancestry' command"""