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

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 15:21:06 UTC
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180218152106-m8bmfurzlspweyu4
Yet more bees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
        if not work_a.supports_setting_file_ids():
29
29
            self.skipTest("working tree does not support setting file ids")
30
30
        self.build_tree(['wta/bla', 'wta/dir/', 'wta/dir/file'])
31
 
        work_a.add(['bla', 'dir', 'dir/file'], ['bla-id', 'dir-id', 'file-id'])
 
31
        work_a.add(['bla', 'dir', 'dir/file'], [b'bla-id', b'dir-id', b'file-id'])
32
32
        work_a.commit('add files')
33
33
        self.tree_a = self.workingtree_to_test_tree(work_a)
34
34
 
35
35
    def test_path2id(self):
36
 
        self.assertEqual('bla-id', self.tree_a.path2id('bla'))
37
 
        self.assertEqual('dir-id', self.tree_a.path2id('dir'))
 
36
        self.assertEqual(b'bla-id', self.tree_a.path2id('bla'))
 
37
        self.assertEqual(b'dir-id', self.tree_a.path2id('dir'))
38
38
        self.assertIs(None, self.tree_a.path2id('idontexist'))
39
39
 
40
40
    def test_path2id_list(self):
41
 
        self.assertEqual('bla-id', self.tree_a.path2id(['bla']))
42
 
        self.assertEqual('dir-id', self.tree_a.path2id(['dir']))
43
 
        self.assertEqual('file-id', self.tree_a.path2id(['dir', 'file']))
 
41
        self.assertEqual(b'bla-id', self.tree_a.path2id(['bla']))
 
42
        self.assertEqual(b'dir-id', self.tree_a.path2id(['dir']))
 
43
        self.assertEqual(b'file-id', self.tree_a.path2id(['dir', 'file']))
44
44
        self.assertEqual(self.tree_a.get_root_id(),
45
45
                         self.tree_a.path2id([]))
46
46
        self.assertIs(None, self.tree_a.path2id(['idontexist']))
48
48
 
49
49
    def test_id2path(self):
50
50
        self.addCleanup(self.tree_a.lock_read().unlock)
51
 
        self.assertEqual('bla', self.tree_a.id2path('bla-id'))
52
 
        self.assertEqual('dir', self.tree_a.id2path('dir-id'))
53
 
        self.assertEqual('dir/file', self.tree_a.id2path('file-id'))
54
 
        self.assertRaises(errors.NoSuchId, self.tree_a.id2path, 'nonexistant')
 
51
        self.assertEqual('bla', self.tree_a.id2path(b'bla-id'))
 
52
        self.assertEqual('dir', self.tree_a.id2path(b'dir-id'))
 
53
        self.assertEqual('dir/file', self.tree_a.id2path(b'file-id'))
 
54
        self.assertRaises(errors.NoSuchId, self.tree_a.id2path, b'nonexistant')