/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2008-12-03 04:23:21 UTC
  • mfrom: (3878 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3892.
  • Revision ID: aaron@aaronbentley.com-20081203042321-kr5k4mdhmdvl3553
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
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,