← 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: Jelmer Vernooij
  • Date: 2012-02-23 23:26:35 UTC
  • mto: This revision was merged to the branch mainline in revision 6486.
  • Revision ID: jelmer@samba.org-20120223232635-opp7nq6ly9562x36
Use controldir rather than bzrdir in a couple more places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_serve.py
34
34
    urlutils,
35
35
    )
36
36
from bzrlib.branch import Branch
37
 
from bzrlib.bzrdir import BzrDir
 
37
from bzrlib.controldir import ControlDir
38
38
from bzrlib.smart import client, medium
39
39
from bzrlib.smart.server import (
40
40
    BzrServerFactory,
221
221
        process, transport = self.start_server_inet(['--allow-writes'])
222
222
 
223
223
        # We get a working branch, and can create a directory
224
 
        branch = BzrDir.open_from_transport(transport).open_branch()
 
224
        branch = ControlDir.open_from_transport(transport).open_branch()
225
225
        self.make_read_requests(branch)
226
226
        transport.mkdir('adir')
227
227
        self.assertInetServerShutsdownCleanly(process)
263
263
        log_fname = os.getcwd() + '/server.log'
264
264
        self.overrideEnv('BZR_LOG', log_fname)
265
265
        process, transport = self.start_server_inet(['-Dhpss'])
266
 
        branch = BzrDir.open_from_transport(transport).open_branch()
 
266
        branch = ControlDir.open_from_transport(transport).open_branch()
267
267
        self.make_read_requests(branch)
268
268
        self.assertInetServerShutsdownCleanly(process)
269
269
        f = open(log_fname, 'rb')