← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/__init__.py
32
32
    weaverepo,
33
33
    )
34
34
from bzrlib.remote import RemoteBzrDirFormat, RemoteRepositoryFormat
35
 
from bzrlib.smart.server import (
36
 
    ReadonlySmartTCPServer_for_testing,
37
 
    ReadonlySmartTCPServer_for_testing_v2_only,
38
 
    SmartTCPServer_for_testing,
39
 
    SmartTCPServer_for_testing_v2_only,
40
 
    )
41
35
from bzrlib.tests import (
42
 
                          default_transport,
43
 
                          multiply_scenarios,
44
 
                          multiply_tests,
45
 
                          )
 
36
    default_transport,
 
37
    multiply_scenarios,
 
38
    multiply_tests,
 
39
    test_server,
 
40
    )
46
41
from bzrlib.tests.per_bzrdir.test_bzrdir import TestCaseWithBzrDir
47
 
from bzrlib.transport.memory import MemoryServer
 
42
from bzrlib.transport import memory
48
43
 
49
44
 
50
45
def formats_to_scenarios(formats, transport_server, transport_readonly_server,
91
86
        None)
92
87
    format_scenarios.extend(formats_to_scenarios(
93
88
        [('-default', RemoteRepositoryFormat())],
94
 
        SmartTCPServer_for_testing,
95
 
        ReadonlySmartTCPServer_for_testing,
96
 
        MemoryServer))
 
89
        test_server.SmartTCPServer_for_testing,
 
90
        test_server.ReadonlySmartTCPServer_for_testing,
 
91
        memory.MemoryServer))
97
92
    format_scenarios.extend(formats_to_scenarios(
98
93
        [('-v2', RemoteRepositoryFormat())],
99
 
        SmartTCPServer_for_testing_v2_only,
100
 
        ReadonlySmartTCPServer_for_testing_v2_only,
101
 
        MemoryServer))
 
94
        test_server.SmartTCPServer_for_testing_v2_only,
 
95
        test_server.ReadonlySmartTCPServer_for_testing_v2_only,
 
96
        memory.MemoryServer))
102
97
    return format_scenarios
103
98
 
104
99