/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_branch/test_update.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-17 09:43:24 UTC
  • mfrom: (7045.1.9 python3-o)
  • Revision ID: breezy.the.bot@gmail.com-20180717094324-sejdvmx3kha2zeq8
Fix another ~500 tests on Python 3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_update.py
67
67
        child_tree.commit('foo', rev_id=b'foo', allow_pointless=True, local=True)
68
68
        # commit to the master making the child tree out of date and not a prefix.
69
69
        master_tree.commit('bar', rev_id=b'bar', allow_pointless=True)
70
 
        self.assertEqual('foo', child_tree.branch.update())
71
 
        self.assertEqual('bar', child_tree.branch.last_revision())
 
70
        self.assertEqual(b'foo', child_tree.branch.update())
 
71
        self.assertEqual(b'bar', child_tree.branch.last_revision())
72
72
 
73
73
    def test_update_in_checkout_of_readonly(self):
74
74
        tree1 = self.make_branch_and_tree('tree1')