← 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: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_re_sign.py
19
19
"""Black-box tests for bzr re-sign.
20
20
"""
21
21
 
22
 
import os
23
 
 
24
22
from bzrlib import (
25
23
    gpg,
26
24
    tests,
27
25
    )
28
 
from bzrlib.bzrdir import BzrDir
 
26
from bzrlib.controldir import ControlDir
29
27
from bzrlib.testament import Testament
30
28
 
31
29
 
41
39
        self.overrideAttr(gpg, 'GPGStrategy', gpg.LoopbackGPGStrategy)
42
40
 
43
41
    def setup_tree(self):
44
 
        wt = BzrDir.create_standalone_workingtree('.')
 
42
        wt = ControlDir.create_standalone_workingtree('.')
45
43
        wt.commit("base A", allow_pointless=True, rev_id='A')
46
44
        wt.commit("base B", allow_pointless=True, rev_id='B')
47
45
        wt.commit("base C", allow_pointless=True, rev_id='C')
91
89
 
92
90
    def test_resign_directory(self):
93
91
        """Test --directory option"""
94
 
        wt = BzrDir.create_standalone_workingtree('a')
 
92
        wt = ControlDir.create_standalone_workingtree('a')
95
93
        wt.commit("base A", allow_pointless=True, rev_id='A')
96
94
        wt.commit("base B", allow_pointless=True, rev_id='B')
97
95
        wt.commit("base C", allow_pointless=True, rev_id='C')