Merge lp:~larstiq/bzr/bzr-pypy into lp:bzr/2.5

[Wouter van Heyst]

Stop depending on the particular CPython ordering of dictionary keys when testing the result of BzrDir.get_branches.

Two tests that are interested in the result of a bzrdir.get_branches() call directly compare the keys() of this dictionary with a list. The sorting of that list is an implementation detail which is not the same under pypy.

The approach taken here was to just wrap the lists in set().

[Jelmer Vernooij (jelmer)]

review: Approve

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2/3/2012 1:57 PM, Wouter van Heyst wrote:
> Wouter van Heyst has proposed merging lp:~larstiq/bzr/bzr-pypy into
> lp:bzr/2.5.
>
> Requested reviews: bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~larstiq/bzr/bzr-pypy/+merge/91428
>
> Two tests that are interested in the result of a
> bzrdir.get_branches() call directly compare the keys() of this
> dictionary with a list. The sorting of that list is an
> implementation detail which is not the same under pypy.
>
> The approach taken here was to just wrap the lists in set().

Just to mention I would usually wrap it in "sorted()" because it is
easier to read when something goes wrong.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk8r3ZIACgkQJdeBCYSNAAMQgACeMbn9umEgD0yOM2sBCc8Rpx1R
7c4AnAytyfbQsGFapH1fy4LyOJZCVumy
=HEb7
-----END PGP SIGNATURE-----

[Martin Pool (mbp)]

sent to pqm by email

=== modified file 'bzrlib/tests/blackbox/test_switch.py'
--- bzrlib/tests/blackbox/test_switch.py	2012-01-19 12:36:22 +0000
+++ bzrlib/tests/blackbox/test_switch.py	2012-02-03 12:56:18 +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'
--- bzrlib/tests/test_remote.py	2012-01-28 01:43:42 +0000
+++ bzrlib/tests/test_remote.py	2012-02-03 12:56:18 +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'
--- doc/en/release-notes/bzr-2.5.txt	2012-02-03 09:26:21 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2012-02-03 12:56:18 +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
 #########