/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 bzrlib/tests/per_tree/test_tree.py

Merge bzr.dev, update to use new hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/test_tree.py
24
24
    )
25
25
from bzrlib.tests import TestSkipped
26
26
from bzrlib.tests.per_tree import TestCaseWithTree
 
27
from bzrlib.symbol_versioning import (
 
28
    deprecated_in,
 
29
    )
 
30
 
27
31
 
28
32
class TestAnnotate(TestCaseWithTree):
29
33
 
94
98
        tree.lock_read()
95
99
        self.addCleanup(tree.unlock)
96
100
        path = tree.id2path('sub-root')
97
 
        self.assertEqual('sub-1', tree.get_reference_revision('sub-root', path))
 
101
        self.assertEqual('sub-1',
 
102
            tree.get_reference_revision('sub-root', path))
98
103
 
99
104
    def test_iter_references(self):
100
105
        tree = self.create_nested()
257
262
        tree = self._convert_tree(work_tree)
258
263
        tree.lock_read()
259
264
        self.addCleanup(tree.unlock)
260
 
        self.assertTrue('file-id' in tree)
261
 
        self.assertFalse('dir-id' in tree)
 
265
        self.assertTrue(
 
266
            self.applyDeprecated(
 
267
                deprecated_in((2, 4, 0)),
 
268
                tree.__contains__, 'file-id'))
 
269
        self.assertFalse(
 
270
            self.applyDeprecated(
 
271
                deprecated_in((2, 4, 0)),
 
272
                tree.__contains__, 'dir-id'))
262
273
 
263
274
 
264
275
class TestExtras(TestCaseWithTree):
292
303
        self.addCleanup(tree.unlock)
293
304
        expected = osutils.sha_strings('file content')
294
305
        self.assertEqual(expected, tree.get_file_sha1('file-id'))
 
306
 
 
307
 
 
308
class TestGetFileVerifier(TestCaseWithTree):
 
309
 
 
310
    def test_get_file_verifier(self):
 
311
        work_tree = self.make_branch_and_tree('tree')
 
312
        self.build_tree_contents([
 
313
            ('tree/file1', 'file content'),
 
314
            ('tree/file2', 'file content')])
 
315
        work_tree.add(['file1', 'file2'], ['file-id-1', 'file-id-2'])
 
316
        tree = self._convert_tree(work_tree)
 
317
        tree.lock_read()
 
318
        self.addCleanup(tree.unlock)
 
319
        (kind, data) = tree.get_file_verifier('file-id-1')
 
320
        self.assertEquals(
 
321
            tree.get_file_verifier('file-id-1'),
 
322
            tree.get_file_verifier('file-id-2'))
 
323
        if kind == "SHA1":
 
324
            expected = osutils.sha_strings('file content')
 
325
            self.assertEqual(expected, data)
 
326
 
 
327
 
 
328
class TestHasVersionedDirectories(TestCaseWithTree):
 
329
 
 
330
    def test_has_versioned_directories(self):
 
331
        work_tree = self.make_branch_and_tree('tree')
 
332
        tree = self._convert_tree(work_tree)
 
333
        self.assertSubset([tree.has_versioned_directories()], (True, False))