/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_tree/test_tree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-23 22:25:11 UTC
  • mto: This revision was merged to the branch mainline in revision 7053.
  • Revision ID: jelmer@jelmer.uk-20180723222511-gns8mqohgakwa2b9
Some brz-git fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_tree.py
139
139
        with tree.lock_read():
140
140
            self.assertEqual(u'a', tree.id2path(a_id))
141
141
            # other ids give an error- don't return None for this case
142
 
            self.assertRaises(errors.NoSuchId, tree.id2path, 'a')
 
142
            self.assertRaises(errors.NoSuchId, tree.id2path, b'a')
143
143
 
144
144
    def test_all_file_ids(self):
145
145
        work_tree = self.make_branch_and_tree('wt')
338
338
        tree = self._convert_tree(work_tree)
339
339
        tree.lock_read()
340
340
        self.addCleanup(tree.unlock)
341
 
        expected = osutils.sha_strings(b'file content')
 
341
        expected = osutils.sha_string(b'file content')
342
342
        self.assertEqual(expected, tree.get_file_sha1('file'))
343
343
 
344
344