/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/per_bzrdir/test_bzrdir.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/per_bzrdir/test_bzrdir.py
464
464
            self.addCleanup(inventory_f.close)
465
465
            self.assertContainsRe(inventory_f.read(),
466
466
                                  '<inventory format="5">\n</inventory>\n')
467
 
        except IOError, e:
 
467
        except IOError as e:
468
468
            if e.errno != errno.ENOENT:
469
469
                raise
470
470
 
689
689
            raise TestNotApplicable('Format does not support colocation')
690
690
        target_branch = repo.bzrdir.create_branch(name='foo')
691
691
        repo.bzrdir.set_branch_reference(target_branch)
692
 
        self.assertEqual(set(["", 'foo']),
 
692
        self.assertEqual({"", 'foo'},
693
693
                         set(repo.bzrdir.get_branches().keys()))