← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_gpg.py

  • Committer: Patch Queue Manager
  • Date: 2012-07-05 14:26:42 UTC
  • mfrom: (6531.1.1 merge-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20120705142642-iacrlxz8rnyti9zh
(jameinel) Merge the 2.5 branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_gpg.py
51
51
        self.my_gpg = gpg.GPGStrategy(FakeConfig())
52
52
 
53
53
    def test_signing_command_line(self):
54
 
        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com', '--no-tty'],
 
54
        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com'],
55
55
                         self.my_gpg._command_line())
56
56
 
57
57
    def test_signing_command_line_from_default(self):
60
60
email=Amy <amy@example.com>
61
61
gpg_signing_key=default
62
62
gpg_signing_command=false'''))
63
 
        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com', '--no-tty'],
 
63
        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com'],
64
64
                         my_gpg._command_line())
65
65
 
66
66
    def test_signing_command_line_from_email(self):
68
68
        my_gpg = gpg.GPGStrategy(FakeConfig('''
69
69
email=Amy <amy@example.com>
70
70
gpg_signing_command=false'''))
71
 
        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com', '--no-tty'],
 
71
        self.assertEqual(['false',  '--clearsign', '-u', 'amy@example.com'],
72
72
                         my_gpg._command_line())
73
73
 
74
74
    def test_checks_return_code(self):