~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-02-06 07:57:06 UTC
mfrom: (6437.30.1 bzr-pypy)
mto: (6437.54.1 2.5) (6468.1.1 merge-2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6469.
Revision ID: pqm@pqm.ubuntu.com-20120206075706-1zaxiu1kz3c4jf7t

(mbp) Stop depending on the particular CPython ordering of dictionary keys
when testing the result of BzrDir.get_branches. (Wouter van Heyst)

added added

removed removed

188

revid2 = tree.commit('rev2')

189

self.run_bzr(['switch', '-b', 'anotherbranch'])

190

self.assertEquals(

191

['', 'anotherbranch'],

192

tree.branch.bzrdir.get_branches().keys())

191

set(['', 'anotherbranch']),

192

set(tree.branch.bzrdir.get_branches().keys()))

193

194

def test_switch_into_unrelated_colocated(self):

195

# Create a new colocated branch from an existing non-colocated branch.