← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-12-01 23:50:52 UTC
  • mfrom: (3834.5.4 sprout_matching_bzrdir)
  • Revision ID: pqm@pqm.ubuntu.com-20081201235052-tlg1kksgj0kuya56
(jam) branch_format._matching_bzrdir.branch_format should always
        match.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/__init__.py
184
184
    tests.adapt_modules(test_branch_implementations, adapter, loader, result)
185
185
 
186
186
    # Add RemoteBranch tests, which need a special server.
 
187
    remote_branch_format = RemoteBranchFormat()
187
188
    adapt_to_smart_server = BranchTestProviderAdapter(
188
189
        SmartTCPServer_for_testing,
189
190
        ReadonlySmartTCPServer_for_testing,
190
 
        [(RemoteBranchFormat(), RemoteBzrDirFormat())],
 
191
        [(remote_branch_format, remote_branch_format._matchingbzrdir)],
191
192
        MemoryServer,
192
193
        name_suffix='-default')
193
194
    tests.adapt_modules(test_branch_implementations,
200
201
    adapt_to_smart_server = BranchTestProviderAdapter(
201
202
        SmartTCPServer_for_testing_v2_only,
202
203
        ReadonlySmartTCPServer_for_testing_v2_only,
203
 
        [(RemoteBranchFormat(), RemoteBzrDirFormat())],
 
204
        [(remote_branch_format, remote_branch_format._matchingbzrdir)],
204
205
        MemoryServer,
205
206
        name_suffix='-v2')
206
207
    tests.adapt_modules(test_branch_implementations,