/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/test_fetch.py

  • Committer: Martin
  • Date: 2018-06-30 22:18:39 UTC
  • mfrom: (7010 work)
  • mto: This revision was merged to the branch mainline in revision 7012.
  • Revision ID: gzlist@googlemail.com-20180630221839-98zi78xwcggestse
Merge trunk to fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_fetch.py
517
517
 
518
518
    def test_two_fetch_changed_root(self):
519
519
        self.make_two_commits(change_root=True, fetch_twice=True)
520
 
        self.assertEqual((), self.get_parents('unique-id', 'second-id'))
 
520
        self.assertEqual((), self.get_parents(b'unique-id', b'second-id'))
521
521
 
522
522
    def test_two_fetches(self):
523
523
        self.make_two_commits(change_root=False, fetch_twice=True)
524
 
        self.assertEqual((('TREE_ROOT', 'first-id'),),
525
 
            self.get_parents('TREE_ROOT', 'second-id'))
 
524
        self.assertEqual(((b'TREE_ROOT', b'first-id'),),
 
525
            self.get_parents(b'TREE_ROOT', b'second-id'))