← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_re_sign.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/blackbox/test_re_sign.py
23
23
    gpg,
24
24
    tests,
25
25
    )
26
 
from bzrlib.bzrdir import BzrDir
 
26
from bzrlib.controldir import ControlDir
27
27
from bzrlib.testament import Testament
28
28
 
29
29
 
39
39
        self.overrideAttr(gpg, 'GPGStrategy', gpg.LoopbackGPGStrategy)
40
40
 
41
41
    def setup_tree(self):
42
 
        wt = BzrDir.create_standalone_workingtree('.')
 
42
        wt = ControlDir.create_standalone_workingtree('.')
43
43
        wt.commit("base A", allow_pointless=True, rev_id='A')
44
44
        wt.commit("base B", allow_pointless=True, rev_id='B')
45
45
        wt.commit("base C", allow_pointless=True, rev_id='C')
89
89
 
90
90
    def test_resign_directory(self):
91
91
        """Test --directory option"""
92
 
        wt = BzrDir.create_standalone_workingtree('a')
 
92
        wt = ControlDir.create_standalone_workingtree('a')
93
93
        wt.commit("base A", allow_pointless=True, rev_id='A')
94
94
        wt.commit("base B", allow_pointless=True, rev_id='B')
95
95
        wt.commit("base C", allow_pointless=True, rev_id='C')