← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/bzrdir_implementations/__init__.py
50
50
    loader = TestLoader()
51
51
    adapt_modules(test_bzrdir_implementations, adapter, loader, result)
52
52
 
53
 
    ## >>>>>>>
54
 
    # XXX:
55
53
    # This will always add the tests for smart server transport, regardless of
56
54
    # the --transport option the user specified to 'bzr selftest'.
57
55
    from bzrlib.smart.server import SmartTCPServer_for_testing, ReadonlySmartTCPServer_for_testing
69
67
                  TestLoader(),
70
68
                  smart_server_suite)
71
69
    result.addTests(smart_server_suite)
72
 
    ## >>>>>>>
73
70
 
74
71
    return result