← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
61
61
from bzrlib.smart.client import _SmartClient
62
62
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
63
63
from bzrlib.tests import (
64
 
    condition_isinstance,
65
 
    multiply_tests,
66
64
    test_server,
67
65
    )
68
66
from bzrlib.tests.scenarios import load_tests_apply_scenarios
71
69
    RemoteTransport,
72
70
    RemoteSSHTransport,
73
71
    RemoteTCPTransport,
74
 
)
 
72
    )
75
73
 
76
74
 
77
75
load_tests = load_tests_apply_scenarios