← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/__init__.py
38
38
from bzrlib.revisiontree import RevisionTree
39
39
from bzrlib.transform import TransformPreview
40
40
from bzrlib.workingtree import (
41
 
    WorkingTreeFormat,
42
 
    _legacy_formats,
 
41
    format_registry,
43
42
    )
44
43
from bzrlib.workingtree_4 import (
45
44
    DirStateRevisionTree,
333
332
        # for working tree format tests, preserve the tree
334
333
        scenario[1]["_workingtree_to_test_tree"] = return_parameter
335
334
    # add RevisionTree scenario
336
 
    workingtree_format = WorkingTreeFormat._default_format
 
335
    workingtree_format = format_registry.get_default()
337
336
    scenarios.append((RevisionTree.__name__,
338
337
        create_tree_scenario(transport_server, transport_readonly_server,
339
338
        workingtree_format, revision_tree_from_workingtree,)))
381
380
        'get_symlink_target',
382
381
        'inv',
383
382
        'iter_search_rules',
 
383
        'is_executable',
384
384
        'list_files',
385
385
        'locking',
386
386
        'path_content_summary',
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._formats.values() + _legacy_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)