~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_tree/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-24 16:09:47 UTC
  • mto: (5582.10.69 weave-fmt-plugin)
  • mto: This revision was merged to the branch mainline in revision 5688.
  • Revision ID: jelmer@samba.org-20110224160947-e7kqclxnjif28v5q
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
from bzrlib.revisiontree import RevisionTree
39
39
from bzrlib.transform import TransformPreview
40
40
from bzrlib.workingtree import (
41
 
    WorkingTreeFormat,
 
41
    format_registry,
42
42
    )
43
43
from bzrlib.workingtree_4 import (
44
44
    DirStateRevisionTree,
332
332
        # for working tree format tests, preserve the tree
333
333
        scenario[1]["_workingtree_to_test_tree"] = return_parameter
334
334
    # add RevisionTree scenario
335
 
    workingtree_format = WorkingTreeFormat._default_format
 
335
    workingtree_format = format_registry.get_default()
336
336
    scenarios.append((RevisionTree.__name__,
337
337
        create_tree_scenario(transport_server, transport_readonly_server,
338
338
        workingtree_format, revision_tree_from_workingtree,)))
397
397
        # None here will cause a readonly decorator to be created
398
398
        # by the TestCaseWithTransport.get_readonly_transport method.
399
399
        None,
400
 
        WorkingTreeFormat.get_formats())
 
400
        format_registry._get_all())
401
401
    # add the tests for the sub modules
402
402
    return tests.multiply_tests(submod_tests, scenarios, standard_tests)