← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

(jelmer) Skip tests that require an inventory when run against a WorkingTree
 that is not inventory based. (Jelmer Vernooij)

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
55
    workingtree_4,
57
56
    )
58
57
from bzrlib.repofmt import (
341
340
        server1 = "a"
342
341
        server2 = "b"
343
342
        formats = [workingtree_4.WorkingTreeFormat4(),
344
 
                   workingtree_3.WorkingTreeFormat3(),]
 
343
                   workingtree.WorkingTreeFormat3(),]
345
344
        scenarios = make_scenarios(server1, server2, formats)
346
345
        self.assertEqual([
347
346
            ('WorkingTreeFormat4',
378
377
        server1 = "a"
379
378
        server2 = "b"
380
379
        formats = [workingtree_4.WorkingTreeFormat4(),
381
 
                   workingtree_3.WorkingTreeFormat3(),]
 
380
                   workingtree.WorkingTreeFormat3(),]
382
381
        scenarios = make_scenarios(server1, server2, formats)
383
382
        self.assertEqual(7, len(scenarios))
384
383
        default_wt_format = workingtree.format_registry.get_default()
455
454
        from bzrlib.tests.per_intertree import (
456
455
            make_scenarios,
457
456
            )
458
 
        from bzrlib.workingtree_3 import WorkingTreeFormat3
 
457
        from bzrlib.workingtree import WorkingTreeFormat3
459
458
        from bzrlib.workingtree_4 import WorkingTreeFormat4
460
459
        input_test = TestInterTreeScenarios(
461
460
            "test_scenarios")