← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2011-10-06 16:41:45 UTC
  • mfrom: (6015.33.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6202.
  • Revision ID: martin.packman@canonical.com-20111006164145-o98oqn32440extgt
Merge 2.4 into dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_rmbranch.py
20
20
from bzrlib import (
21
21
    bzrdir,
22
22
    )
23
 
from bzrlib.tests.blackbox import (
24
 
    ExternalBase,
 
23
from bzrlib.tests import (
 
24
    TestCaseWithTransport,
25
25
    )
26
26
 
27
27
 
28
 
class TestRemoveBranch(ExternalBase):
 
28
class TestRemoveBranch(TestCaseWithTransport):
29
29
 
30
30
    def example_branch(self, path='.'):
31
31
        tree = self.make_branch_and_tree(path)
42
42
        self.run_bzr('rmbranch a')
43
43
        dir = bzrdir.BzrDir.open('a')
44
44
        self.assertFalse(dir.has_branch())
45
 
        self.failUnlessExists('a/hello')
46
 
        self.failUnlessExists('a/goodbye')
 
45
        self.assertPathExists('a/hello')
 
46
        self.assertPathExists('a/goodbye')
47
47
 
48
48
    def test_no_branch(self):
49
49
        # No branch in the current directory.