← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Vincent Ladeuil
  • Date: 2011-04-28 14:12:08 UTC
  • mto: This revision was merged to the branch mainline in revision 5813.
  • Revision ID: v.ladeuil+lp@free.fr-20110428141208-u6n3jboj8whgizvy
Open trunk again as 2.4dev3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
52
52
    tests,
53
53
    transport,
54
54
    workingtree,
55
 
    workingtree_3,
56
 
    workingtree_4,
57
55
    )
58
56
from bzrlib.repofmt import (
59
57
    groupcompress_repo,
340
338
        from bzrlib.tests.per_workingtree import make_scenarios
341
339
        server1 = "a"
342
340
        server2 = "b"
343
 
        formats = [workingtree_4.WorkingTreeFormat4(),
344
 
                   workingtree_3.WorkingTreeFormat3(),]
 
341
        formats = [workingtree.WorkingTreeFormat4(),
 
342
                   workingtree.WorkingTreeFormat3(),]
345
343
        scenarios = make_scenarios(server1, server2, formats)
346
344
        self.assertEqual([
347
345
            ('WorkingTreeFormat4',
377
375
            )
378
376
        server1 = "a"
379
377
        server2 = "b"
380
 
        formats = [workingtree_4.WorkingTreeFormat4(),
381
 
                   workingtree_3.WorkingTreeFormat3(),]
 
378
        formats = [workingtree.WorkingTreeFormat4(),
 
379
                   workingtree.WorkingTreeFormat3(),]
382
380
        scenarios = make_scenarios(server1, server2, formats)
383
381
        self.assertEqual(7, len(scenarios))
384
382
        default_wt_format = workingtree.format_registry.get_default()
385
 
        wt4_format = workingtree_4.WorkingTreeFormat4()
386
 
        wt5_format = workingtree_4.WorkingTreeFormat5()
 
383
        wt4_format = workingtree.WorkingTreeFormat4()
 
384
        wt5_format = workingtree.WorkingTreeFormat5()
387
385
        expected_scenarios = [
388
386
            ('WorkingTreeFormat4',
389
387
             {'bzrdir_format': formats[0]._matchingbzrdir,
455
453
        from bzrlib.tests.per_intertree import (
456
454
            make_scenarios,
457
455
            )
458
 
        from bzrlib.workingtree_3 import WorkingTreeFormat3
459
 
        from bzrlib.workingtree_4 import WorkingTreeFormat4
 
456
        from bzrlib.workingtree import WorkingTreeFormat3, WorkingTreeFormat4
460
457
        input_test = TestInterTreeScenarios(
461
458
            "test_scenarios")
462
459
        server1 = "a"
2813
2810
        self.assertEqual(remaining_names, _test_ids(split_suite[1]))
2814
2811
 
2815
2812
 
2816
 
class TestCheckTreeShape(tests.TestCaseWithTransport):
 
2813
class TestCheckInventoryShape(tests.TestCaseWithTransport):
2817
2814
 
2818
 
    def test_check_tree_shape(self):
 
2815
    def test_check_inventory_shape(self):
2819
2816
        files = ['a', 'b/', 'b/c']
2820
2817
        tree = self.make_branch_and_tree('.')
2821
2818
        self.build_tree(files)
2822
2819
        tree.add(files)
2823
2820
        tree.lock_read()
2824
2821
        try:
2825
 
            self.check_tree_shape(tree, files)
 
2822
            self.check_inventory_shape(tree.inventory, files)
2826
2823
        finally:
2827
2824
            tree.unlock()
2828
2825