← Back to branch summary

~jelmer/brz/tree-reference-fixes

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_re_sign.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 12:47:13 UTC
  • mfrom: (6926.1.2 work)
  • Revision ID: jelmer@jelmer.uk-20180325124713-dq64vm9bhch1gjow
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_re_sign.py
40
40
 
41
41
    def setup_tree(self):
42
42
        wt = ControlDir.create_standalone_workingtree('.')
43
 
        wt.commit("base A", allow_pointless=True, rev_id='A')
44
 
        wt.commit("base B", allow_pointless=True, rev_id='B')
45
 
        wt.commit("base C", allow_pointless=True, rev_id='C')
 
43
        wt.commit("base A", allow_pointless=True, rev_id=b'A')
 
44
        wt.commit("base B", allow_pointless=True, rev_id=b'B')
 
45
        wt.commit("base C", allow_pointless=True, rev_id=b'C')
46
46
 
47
47
        return wt
48
48
 
90
90
    def test_resign_directory(self):
91
91
        """Test --directory option"""
92
92
        wt = ControlDir.create_standalone_workingtree('a')
93
 
        wt.commit("base A", allow_pointless=True, rev_id='A')
94
 
        wt.commit("base B", allow_pointless=True, rev_id='B')
95
 
        wt.commit("base C", allow_pointless=True, rev_id='C')
 
93
        wt.commit("base A", allow_pointless=True, rev_id=b'A')
 
94
        wt.commit("base B", allow_pointless=True, rev_id=b'B')
 
95
        wt.commit("base C", allow_pointless=True, rev_id=b'C')
96
96
        repo = wt.branch.repository
97
97
        self.monkey_patch_gpg()
98
98
        self.run_bzr('re-sign --directory=a -r revid:A')