/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_switch.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_switch.py
206
206
        revid2 = tree.commit('rev2')
207
207
        self.run_bzr(['switch', '-b', 'anotherbranch'])
208
208
        self.assertEqual(
209
 
            set(['', 'anotherbranch']),
 
209
            {'', 'anotherbranch'},
210
210
            set(tree.branch.bzrdir.get_branches().keys()))
211
211
 
212
212
    def test_switch_into_unrelated_colocated(self):
254
254
        self.run_bzr(['switch', '-b', 'anotherbranch'], working_dir='branch-1')
255
255
        bzrdir = ControlDir.open("branch-1")
256
256
        self.assertEqual(
257
 
            set([b.name for b in bzrdir.list_branches()]),
258
 
            set(["foo", "anotherbranch"]))
 
257
            {b.name for b in bzrdir.list_branches()},
 
258
            {"foo", "anotherbranch"})
259
259
        self.assertEqual(bzrdir.open_branch().name, "anotherbranch")
260
260
        self.assertEqual(bzrdir.open_branch().last_revision(), revid1)
261
261
 
273
273
        self.run_bzr(['switch', '-b', u'branch\xe9'], working_dir='branch-1')
274
274
        bzrdir = ControlDir.open("branch-1")
275
275
        self.assertEqual(
276
 
            set([b.name for b in bzrdir.list_branches()]),
277
 
            set(["foo", u"branch\xe9"]))
 
276
            {b.name for b in bzrdir.list_branches()},
 
277
            {"foo", u"branch\xe9"})
278
278
        self.assertEqual(bzrdir.open_branch().name, u"branch\xe9")
279
279
        self.assertEqual(bzrdir.open_branch().last_revision(), revid1)
280
280