/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/blackbox/test_remove.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-15 18:45:17 UTC
  • mto: (7045.3.3 python3-r)
  • mto: This revision was merged to the branch mainline in revision 7047.
  • Revision ID: jelmer@jelmer.uk-20180715184517-1ipa50jg36zvglc5
Fix another 300 tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_remove.py
27
27
from breezy.workingtree import WorkingTree
28
28
from breezy import osutils
29
29
 
30
 
_id='-id'
 
30
_id=b'-id'
31
31
a='a'
32
32
b='b/'
33
33
c='b/c'
43
43
        try:
44
44
            self.build_tree(paths)
45
45
            for path in paths:
46
 
                file_id=str(path).replace('/', '_') + _id
 
46
                file_id=path.replace('/', '_').encode('utf-8') + _id
47
47
                tree.add(path, file_id)
48
48
        finally:
49
49
            tree.unlock()
51
51
 
52
52
    def assertFilesDeleted(self, files):
53
53
        for f in files:
54
 
            id=f+_id
 
54
            id=f.encode('utf-8')+_id
55
55
            self.assertNotInWorkingTree(f)
56
56
            self.assertPathDoesNotExist(f)
57
57
 
264
264
                     error_regexes=["removed b", "removed b/c"])
265
265
        tree = WorkingTree.open('.')
266
266
        self.assertInWorkingTree(a)
267
 
        self.assertEqual(tree.path2id(a), a + _id)
 
267
        self.assertEqual(tree.path2id(a), a.encode('utf-8') + _id)
268
268
        self.assertFilesUnversioned([b, c])
269
269
 
270
270
    def test_remove_with_new_in_dir2(self):