← 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 08:49:15 UTC
  • mfrom: (5818 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5819.
  • Revision ID: jelmer@samba.org-20110504084915-05bjgkllosui58o9
Merge bzr.dev, resolve conflict.

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_4,
55
56
    )
56
57
from bzrlib.repofmt import (
57
58
    groupcompress_repo,
338
339
        from bzrlib.tests.per_workingtree import make_scenarios
339
340
        server1 = "a"
340
341
        server2 = "b"
341
 
        formats = [workingtree.WorkingTreeFormat4(),
 
342
        formats = [workingtree_4.WorkingTreeFormat4(),
342
343
                   workingtree.WorkingTreeFormat3(),]
343
344
        scenarios = make_scenarios(server1, server2, formats)
344
345
        self.assertEqual([
375
376
            )
376
377
        server1 = "a"
377
378
        server2 = "b"
378
 
        formats = [workingtree.WorkingTreeFormat4(),
 
379
        formats = [workingtree_4.WorkingTreeFormat4(),
379
380
                   workingtree.WorkingTreeFormat3(),]
380
381
        scenarios = make_scenarios(server1, server2, formats)
381
382
        self.assertEqual(7, len(scenarios))
382
383
        default_wt_format = workingtree.format_registry.get_default()
383
 
        wt4_format = workingtree.WorkingTreeFormat4()
384
 
        wt5_format = workingtree.WorkingTreeFormat5()
 
384
        wt4_format = workingtree_4.WorkingTreeFormat4()
 
385
        wt5_format = workingtree_4.WorkingTreeFormat5()
385
386
        expected_scenarios = [
386
387
            ('WorkingTreeFormat4',
387
388
             {'bzrdir_format': formats[0]._matchingbzrdir,
453
454
        from bzrlib.tests.per_intertree import (
454
455
            make_scenarios,
455
456
            )
456
 
        from bzrlib.workingtree import WorkingTreeFormat3, WorkingTreeFormat4
 
457
        from bzrlib.workingtree import WorkingTreeFormat3
 
458
        from bzrlib.workingtree_4 import WorkingTreeFormat4
457
459
        input_test = TestInterTreeScenarios(
458
460
            "test_scenarios")
459
461
        server1 = "a"