← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_transport.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_transport.py
32
32
import bzrlib
33
33
from bzrlib import (
34
34
        bzrdir,
 
35
        controldir,
35
36
        debug,
36
37
        errors,
37
38
        osutils,
1628
1629
        transport = self.transport
1629
1630
        t = self.backing_transport
1630
1631
        bzrdir.BzrDirFormat.get_default_format().initialize_on_transport(t)
1631
 
        result_dir = bzrdir.BzrDir.open_containing_from_transport(transport)
 
1632
        result_dir = controldir.ControlDir.open_containing_from_transport(
 
1633
            transport)
1632
1634
 
1633
1635
 
1634
1636
class ReadOnlyEndToEndTests(SmartTCPTests):