← 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: Jelmer Vernooij
  • Date: 2011-05-04 22:23:20 UTC
  • mfrom: (5825 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5830.
  • Revision ID: jelmer@samba.org-20110504222320-bczsppms2wadcrb4
Merge bzr.dev.

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,
55
56
    workingtree_4,
56
57
    )
57
58
from bzrlib.repofmt import (
340
341
        server1 = "a"
341
342
        server2 = "b"
342
343
        formats = [workingtree_4.WorkingTreeFormat4(),
343
 
                   workingtree.WorkingTreeFormat3(),]
 
344
                   workingtree_3.WorkingTreeFormat3(),]
344
345
        scenarios = make_scenarios(server1, server2, formats)
345
346
        self.assertEqual([
346
347
            ('WorkingTreeFormat4',
377
378
        server1 = "a"
378
379
        server2 = "b"
379
380
        formats = [workingtree_4.WorkingTreeFormat4(),
380
 
                   workingtree.WorkingTreeFormat3(),]
 
381
                   workingtree_3.WorkingTreeFormat3(),]
381
382
        scenarios = make_scenarios(server1, server2, formats)
382
383
        self.assertEqual(7, len(scenarios))
383
384
        default_wt_format = workingtree.format_registry.get_default()
2812
2813
        self.assertEqual(remaining_names, _test_ids(split_suite[1]))
2813
2814
 
2814
2815
 
2815
 
class TestCheckInventoryShape(tests.TestCaseWithTransport):
 
2816
class TestCheckTreeShape(tests.TestCaseWithTransport):
2816
2817
 
2817
 
    def test_check_inventory_shape(self):
 
2818
    def test_check_tree_shape(self):
2818
2819
        files = ['a', 'b/', 'b/c']
2819
2820
        tree = self.make_branch_and_tree('.')
2820
2821
        self.build_tree(files)
2821
2822
        tree.add(files)
2822
2823
        tree.lock_read()
2823
2824
        try:
2824
 
            self.check_inventory_shape(tree.inventory, files)
 
2825
            self.check_tree_shape(tree, files)
2825
2826
        finally:
2826
2827
            tree.unlock()
2827
2828