← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_serve.py

  • Committer: Robert Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_serve.py
30
30
from bzrlib.branch import Branch
31
31
from bzrlib.bzrdir import BzrDir
32
32
from bzrlib.errors import ParamikoNotPresent
 
33
from bzrlib.smart import medium
33
34
from bzrlib.tests import TestCaseWithTransport, TestSkipped
34
 
from bzrlib.transport import get_transport, smart
 
35
from bzrlib.transport import get_transport, remote
35
36
 
36
37
 
37
38
class TestBzrServe(TestCaseWithTransport):
68
69
        # Connect to the server
69
70
        # We use this url because while this is no valid URL to connect to this
70
71
        # server instance, the transport needs a URL.
71
 
        medium = smart.SmartSimplePipesClientMedium(
 
72
        client_medium = medium.SmartSimplePipesClientMedium(
72
73
            process.stdout, process.stdin)
73
 
        transport = smart.SmartTransport('bzr://localhost/', medium=medium)
 
74
        transport = remote.RemoteTransport(
 
75
            'bzr://localhost/', medium=client_medium)
74
76
        return process, transport
75
77
 
76
78
    def start_server_port(self, extra_options=()):