← 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: Canonical.com Patch Queue Manager
  • Date: 2011-04-16 01:09:56 UTC
  • mfrom: (5784.1.4 760435-less-fail)
  • Revision ID: pqm@pqm.ubuntu.com-20110416010956-5wrpm136qq2hz5f3
(mbp) rename and deprecate failUnlessExists and failIfExists (Martin Pool)

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