/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-03-25 00:39:16 UTC
  • mfrom: (6926 work)
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180325003916-mqa5uj4uq55hrjq9
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_tree.py
56
56
        work_b = work_a.controldir.sprout('wtb').open_workingtree()
57
57
        self.build_tree_contents([('wta/file', b'b\nc\nd\ne\n')])
58
58
        tree_a = self.workingtree_to_test_tree(work_a)
 
59
        if getattr(tree_a, 'plan_file_merge', None) is None:
 
60
            raise tests.TestNotApplicable('Tree does not support plan_file_merge')
59
61
        tree_a.lock_read()
60
62
        self.addCleanup(tree_a.unlock)
61
63
        self.build_tree_contents([('wtb/file', b'a\nc\nd\nf\n')])
120
122
        tree = self.make_branch_and_tree('tree')
121
123
        self.assertTrue(tree.is_versioned(''))
122
124
        self.assertFalse(tree.is_versioned('blah'))
 
125
        self.build_tree(['tree/dir/', 'tree/dir/file'])
 
126
        self.assertFalse(tree.is_versioned('dir'))
 
127
        self.assertFalse(tree.is_versioned('dir/'))
 
128
        tree.add(['dir', 'dir/file'])
 
129
        self.assertTrue(tree.is_versioned('dir'))
 
130
        self.assertTrue(tree.is_versioned('dir/'))
123
131
 
124
132
 
125
133
class TestFileIds(TestCaseWithTree):
224
232
        tree.lock_read()
225
233
        self.addCleanup(tree.unlock)
226
234
        extracted = dict((i, ''.join(b)) for i, b in
227
 
                         tree.iter_files_bytes([(tree.path2id('foo'), 'id1'),
228
 
                                                (tree.path2id('bar'), 'id2'),
229
 
                                                (tree.path2id('baz'), 'id3')]))
 
235
                         tree.iter_files_bytes([('foo', 'id1'),
 
236
                                                ('bar', 'id2'),
 
237
                                                ('baz', 'id3')]))
230
238
        self.assertEqual('foo', extracted['id1'])
231
239
        self.assertEqual('bar', extracted['id2'])
232
240
        self.assertEqual('baz', extracted['id3'])
233
 
        self.assertRaises(errors.NoSuchId, lambda: list(
 
241
        self.assertRaises(errors.NoSuchFile, lambda: list(
234
242
                          tree.iter_files_bytes(
235
 
                          [('qux-id', 'file1-notpresent')])))
 
243
                          [('qux', 'file1-notpresent')])))
236
244
 
237
245
 
238
246
class TestConflicts(TestCaseWithTree):
351
359
    def test_has_versioned_directories(self):
352
360
        work_tree = self.make_branch_and_tree('tree')
353
361
        tree = self._convert_tree(work_tree)
354
 
        self.assertSubset([tree.has_versioned_directories()], (True, False))
 
362
        self.assertIn(tree.has_versioned_directories(), (True, False))
 
363
 
 
364
 
 
365
class TestSupportsRenameTracking(TestCaseWithTree):
 
366
 
 
367
    def test_supports_rename_tracking(self):
 
368
        work_tree = self.make_branch_and_tree('tree')
 
369
        tree = self._convert_tree(work_tree)
 
370
        self.assertSubset([tree.supports_rename_tracking()], (True, False))