← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

  • Committer: Andrew Bennetts
  • Date: 2010-12-14 23:14:44 UTC
  • mfrom: (5569 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5570.
  • Revision ID: andrew.bennetts@canonical.com-20101214231444-uubf7zjbg8q92ocs
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
62
62
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
63
63
from bzrlib.tests import (
64
64
    condition_isinstance,
65
 
    split_suite_by_condition,
66
65
    multiply_tests,
67
66
    test_server,
68
67
    )
 
68
from bzrlib.tests.scenarios import load_tests_apply_scenarios
69
69
from bzrlib.transport.memory import MemoryTransport
70
70
from bzrlib.transport.remote import (
71
71
    RemoteTransport,
73
73
    RemoteTCPTransport,
74
74
)
75
75
 
76
 
def load_tests(standard_tests, module, loader):
77
 
    to_adapt, result = split_suite_by_condition(
78
 
        standard_tests, condition_isinstance(BasicRemoteObjectTests))
79
 
    smart_server_version_scenarios = [
 
76
 
 
77
load_tests = load_tests_apply_scenarios
 
78
 
 
79
 
 
80
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
 
81
 
 
82
    scenarios = [
80
83
        ('HPSS-v2',
81
 
         {'transport_server': test_server.SmartTCPServer_for_testing_v2_only}),
 
84
            {'transport_server': test_server.SmartTCPServer_for_testing_v2_only}),
82
85
        ('HPSS-v3',
83
 
         {'transport_server': test_server.SmartTCPServer_for_testing})]
84
 
    return multiply_tests(to_adapt, smart_server_version_scenarios, result)
85
 
 
86
 
 
87
 
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
 
86
            {'transport_server': test_server.SmartTCPServer_for_testing})]
 
87
 
88
88
 
89
89
    def setUp(self):
90
90
        super(BasicRemoteObjectTests, self).setUp()