/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/upload/tests/test_upload.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 10:47:22 UTC
  • mfrom: (6973.9.5 python3-h)
  • Revision ID: breezy.the.bot@gmail.com-20180630104722-b2dwuvyepexok616
Fix some more tests on python3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-h/+merge/348245

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/tests/test_upload.py
342
342
        self.run_bzr('branch branch other')
343
343
        self.modify_file('a', b'bar')
344
344
        other_tree = workingtree.WorkingTree.open('other')
345
 
        self.set_file_content('a', 'baz', b'other/')
 
345
        self.set_file_content('a', b'baz', 'other/')
346
346
        other_tree.commit('modify file a')
347
347
 
348
348
        self.run_bzr('merge -d branch other', retcode=1)