/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
88
88
        self.assertEqualSignature(repo, 'A')
89
89
        self.assertEqualSignature(repo, 'B')
90
90
        self.assertEqualSignature(repo, 'C')
 
91
 
 
92
    def test_resign_directory(self):
 
93
        """Test --directory option"""
 
94
        wt = BzrDir.create_standalone_workingtree('a')
 
95
        wt.commit("base A", allow_pointless=True, rev_id='A')
 
96
        wt.commit("base B", allow_pointless=True, rev_id='B')
 
97
        wt.commit("base C", allow_pointless=True, rev_id='C')
 
98
        repo = wt.branch.repository
 
99
        self.monkey_patch_gpg()
 
100
        self.run_bzr('re-sign --directory=a -r revid:A')
 
101
        self.assertEqualSignature(repo, 'A')
 
102
        self.run_bzr('re-sign -d a B')
 
103
        self.assertEqualSignature(repo, 'B')