/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/plugins/weave_fmt/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-14 10:06:05 UTC
  • mfrom: (6963.2.19 python3-weave-fmt)
  • Revision ID: jelmer@jelmer.uk-20180614100605-7sg9ai8wdvpknkmr
Merge lp:~jelmer/brz/python3-weave-fmt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/test_workingtree.py
86
86
        conflicts.restore('hello')
87
87
        conflicts.restore('hello.sploo')
88
88
        self.assertLength(0, tree.conflicts())
89
 
        self.assertFileEqual('hello world2', b'hello')
 
89
        self.assertFileEqual(b'hello world2', 'hello')
90
90
        self.assertFalse(os.path.lexists('hello.sploo'))
91
91
        self.assertRaises(errors.NotConflicted, conflicts.restore, 'hello')
92
92
        self.assertRaises(errors.NotConflicted,