← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_url_policy_open.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_url_policy_open.py
22
22
    BranchReferenceFormat,
23
23
    )
24
24
from bzrlib.bzrdir import (
25
 
    BzrDir,
26
25
    BzrProber,
27
26
    )
28
 
from bzrlib.controldir import ControlDirFormat
 
27
from bzrlib.controldir import (
 
28
    ControlDir,
 
29
    ControlDirFormat,
 
30
    )
29
31
from bzrlib.errors import NotBranchError
30
32
from bzrlib.url_policy_open import (
31
33
    BadUrl,
182
184
        self.assertRaises(NotBranchError, opener.open, ".")
183
185
        self.assertEquals(1, len(TrackingProber.seen_urls))
184
186
        TrackingProber.seen_urls = []
185
 
        # And make sure it's registered in such a way that BzrDir.open would
 
187
        # And make sure it's registered in such a way that ControlDir.open would
186
188
        # use it.
187
 
        self.assertRaises(NotBranchError, BzrDir.open, ".")
 
189
        self.assertRaises(NotBranchError, ControlDir.open, ".")
188
190
        self.assertEquals(1, len(TrackingProber.seen_urls))
189
191
 
190
192
    def test_allowed_url(self):