Rev 6473: (mbp) Stop depending on the particular CPython ordering of dictionary keys in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

------------------------------------------------------------
revno: 6473 [merge]
revision-id: pqm at pqm.ubuntu.com-20120206075706-1zaxiu1kz3c4jf7t
parent: pqm at pqm.ubuntu.com-20120203095750-rvgsywx35nqn65n2
parent: larstiq at larstiq.dyndns.org-20120203124710-aczxxzinnvkfpbrs
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.5
timestamp: Mon 2012-02-06 07:57:06 +0000
message:
  (mbp) Stop depending on the particular CPython ordering of dictionary keys
   when testing the result of BzrDir.get_branches. (Wouter van Heyst)
modified:
  bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/tests/blackbox/test_switch.py'
--- a/bzrlib/tests/blackbox/test_switch.py	2012-01-19 12:36:22 +0000
+++ b/bzrlib/tests/blackbox/test_switch.py	2012-02-03 12:47:10 +0000
@@ -188,8 +188,8 @@
         revid2 = tree.commit('rev2')
         self.run_bzr(['switch', '-b', 'anotherbranch'])
         self.assertEquals(
-            ['', 'anotherbranch'],
-            tree.branch.bzrdir.get_branches().keys())
+            set(['', 'anotherbranch']),
+            set(tree.branch.bzrdir.get_branches().keys()))
 
     def test_switch_into_unrelated_colocated(self):
         # Create a new colocated branch from an existing non-colocated branch.

=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py	2012-01-28 01:43:42 +0000
+++ b/bzrlib/tests/test_remote.py	2012-02-03 12:47:10 +0000
@@ -565,7 +565,7 @@
         a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
             _client=client)
         result = a_bzrdir.get_branches()
-        self.assertEquals(["", "foo"], result.keys())
+        self.assertEquals(set(["", "foo"]), set(result.keys()))
         self.assertEqual(
             [('call_expecting_body', 'BzrDir.get_branches', ('quack/',)),
              ('call', 'BzrDir.find_repositoryV3', ('quack/', )),

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2012-02-03 09:26:21 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2012-02-03 12:47:10 +0000
@@ -57,6 +57,9 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+* Stop depending on the particular CPython ordering of dictionary keys
+  when testing the result of BzrDir.get_branches.
+  (Wouter van Heyst)
 
 bzr 2.5b6
 #########