← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/__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_branch/__init__.py
34
34
from bzrlib.remote import RemoteBranchFormat, RemoteBzrDirFormat
35
35
from bzrlib.tests import test_server
36
36
from bzrlib.tests.per_bzrdir.test_bzrdir import TestCaseWithBzrDir
 
37
from bzrlib.transport import memory
37
38
 
38
39
 
39
40
def make_scenarios(transport_server, transport_readonly_server,
145
146
        test_server.SmartTCPServer_for_testing,
146
147
        test_server.ReadonlySmartTCPServer_for_testing,
147
148
        [(remote_branch_format, remote_branch_format._matchingbzrdir)],
148
 
        test_server.MemoryServer,
 
149
        memory.MemoryServer,
149
150
        name_suffix='-default'))
150
151
    # Also add tests for RemoteBranch with HPSS protocol v2 (i.e. bzr <1.6)
151
152
    # server.
153
154
        test_server.SmartTCPServer_for_testing_v2_only,
154
155
        test_server.ReadonlySmartTCPServer_for_testing_v2_only,
155
156
        [(remote_branch_format, remote_branch_format._matchingbzrdir)],
156
 
        test_server.MemoryServer,
 
157
        memory.MemoryServer,
157
158
        name_suffix='-v2'))
158
159
    return scenarios
159
160