← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

Merge propagate-exceptions into http-leaks resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
2406
2406
        made_control = self.make_bzrdir(relpath, format=format)
2407
2407
        return made_control.create_repository(shared=shared)
2408
2408
 
2409
 
    def make_smart_server(self, path):
 
2409
    def make_smart_server(self, path, backing_server=None):
 
2410
        if backing_server is None:
 
2411
            backing_server = self.get_server()
2410
2412
        smart_server = test_server.SmartTCPServer_for_testing()
2411
 
        self.start_server(smart_server, self.get_server())
 
2413
        self.start_server(smart_server, backing_server)
2412
2414
        remote_transport = _mod_transport.get_transport(smart_server.get_url()
2413
2415
                                                   ).clone(path)
2414
2416
        return remote_transport
3735
3737
        'bzrlib.tests.test_knit',
3736
3738
        'bzrlib.tests.test_lazy_import',
3737
3739
        'bzrlib.tests.test_lazy_regex',
 
3740
        'bzrlib.tests.test_library_state',
3738
3741
        'bzrlib.tests.test_lock',
3739
3742
        'bzrlib.tests.test_lockable_files',
3740
3743
        'bzrlib.tests.test_lockdir',