← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Add Remote-v2 variant to branch/repository/bzrdir implementations
        tests. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/__init__.py
33
33
    )
34
34
from bzrlib.remote import RemoteBzrDirFormat, RemoteRepositoryFormat
35
35
from bzrlib.smart.server import (
 
36
    ReadonlySmartTCPServer_for_testing,
 
37
    ReadonlySmartTCPServer_for_testing_v2_only,
36
38
    SmartTCPServer_for_testing,
37
 
    ReadonlySmartTCPServer_for_testing,
 
39
    SmartTCPServer_for_testing_v2_only,
38
40
    )
39
41
from bzrlib.tests import (
40
42
                          adapt_modules,
52
54
    vfs_transport_factory=None):
53
55
    """Transform the input formats to a list of scenarios.
54
56
 
55
 
    :param formats: A list of (scenario_name, scenario_info)
 
57
    :param formats: A list of (scenario_name_suffix, repo_format, bzrdir_format)
56
58
        where the scenario_info is a dict that controls the test.
57
59
    """
58
60
    result = []
59
 
    for repository_format, bzrdir_format in formats:
60
 
        scenario = (repository_format.__class__.__name__,
 
61
    for scenario_name_suffix, repository_format, bzrdir_format in formats:
 
62
        scenario_name = repository_format.__class__.__name__
 
63
        scenario_name += scenario_name_suffix
 
64
        scenario = (scenario_name,
61
65
            {"transport_server":transport_server,
62
66
             "transport_readonly_server":transport_readonly_server,
63
67
             "bzrdir_format":bzrdir_format,
73
77
 
74
78
def all_repository_format_scenarios():
75
79
    """Return a list of test scenarios for parameterising repository tests.
76
 
    
77
 
    :param formats: A list of (scenario_name, scenario_info)
78
 
        where the scenario_info is a dict that controls the test.
79
80
    """
80
81
    registry = repository.format_registry
81
82
    all_formats = [registry.get(k) for k in registry.keys()]
83
84
    # format_scenarios is all the implementations of Repository; i.e. all disk
84
85
    # formats plus RemoteRepository.
85
86
    format_scenarios = formats_to_scenarios(
86
 
        [(format, format._matchingbzrdir) for format in all_formats],
 
87
        [('', format, format._matchingbzrdir) for format in all_formats],
87
88
        default_transport,
88
89
        # None here will cause a readonly decorator to be created
89
90
        # by the TestCaseWithTransport.get_readonly_transport method.
90
91
        None)
91
92
    format_scenarios.extend(formats_to_scenarios(
92
 
        [(RemoteRepositoryFormat(), RemoteBzrDirFormat())],
 
93
        [('-default', RemoteRepositoryFormat(), RemoteBzrDirFormat())],
93
94
        SmartTCPServer_for_testing,
94
95
        ReadonlySmartTCPServer_for_testing,
95
96
        MemoryServer))
 
97
    format_scenarios.extend(formats_to_scenarios(
 
98
        [('-v2', RemoteRepositoryFormat(), RemoteBzrDirFormat())],
 
99
        SmartTCPServer_for_testing_v2_only,
 
100
        ReadonlySmartTCPServer_for_testing_v2_only,
 
101
        MemoryServer))
96
102
    return format_scenarios
97
103
 
98
104