← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2010-02-11 09:21:45 UTC
  • mto: (5029.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100211092145-drh33z43szccfswy
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/__init__.py
31
31
    test_server,
32
32
    TestCaseWithTransport,
33
33
    )
 
34
from bzrlib.transport import memory
34
35
 
35
36
 
36
37
def make_scenarios(vfs_factory, transport_server, transport_readonly_server,
92
93
    # test the remote server behaviour when backed with a MemoryTransport
93
94
    # Once for the current version
94
95
    scenarios.extend(make_scenarios(
95
 
        test_server.MemoryServer,
 
96
        memory.MemoryServer,
96
97
        test_server.SmartTCPServer_for_testing,
97
98
        test_server.ReadonlySmartTCPServer_for_testing,
98
99
        [(RemoteBzrDirFormat())],
99
100
        name_suffix='-default'))
100
101
    # And once with < 1.6 - the 'v2' protocol.
101
102
    scenarios.extend(make_scenarios(
102
 
        test_server.MemoryServer,
 
103
        memory.MemoryServer,
103
104
        test_server.SmartTCPServer_for_testing_v2_only,
104
105
        test_server.ReadonlySmartTCPServer_for_testing_v2_only,
105
106
        [(RemoteBzrDirFormat())],