← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.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_http.py
31
31
 
32
32
import bzrlib
33
33
from bzrlib import (
34
 
    bzrdir,
35
34
    config,
 
35
    controldir,
36
36
    debug,
37
37
    errors,
38
38
    osutils,
1911
1911
        server._url_protocol = self._url_protocol
1912
1912
        return server
1913
1913
 
1914
 
    def test_open_bzrdir(self):
 
1914
    def test_open_controldir(self):
1915
1915
        branch = self.make_branch('relpath')
1916
1916
        url = self.http_server.get_url() + 'relpath'
1917
 
        bd = bzrdir.BzrDir.open(url)
 
1917
        bd = controldir.ControlDir.open(url)
1918
1918
        self.addCleanup(bd.transport.disconnect)
1919
1919
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1920
1920