← 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: 2013-06-24 13:05:33 UTC
  • mfrom: (6578.1.1 2.6-merges-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20130624130533-51c8htekjd8mix3u
(jameinel) Merge bzr/2.5 into trunk,
 including the fix for bug #855155 (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_gpg.py
499
499
        self.assertEqual(my_gpg.acceptable_keys,
500
500
                         [u'B5DEED5FCB15DAE6ECEF919587681B1EE3080E45'])
501
501
 
502
 
    def test_set_acceptable_keys_from_config(self):
503
 
        self.requireFeature(features.gpgme)
504
 
        self.import_keys()
505
 
        my_gpg = gpg.GPGStrategy(FakeConfig(
506
 
                'acceptable_keys=bazaar@example.com'))
507
 
        my_gpg.set_acceptable_keys(None)
508
 
        self.assertEqual(my_gpg.acceptable_keys,
509
 
                         [u'B5DEED5FCB15DAE6ECEF919587681B1EE3080E45'])
510
 
 
511
502
    def test_set_acceptable_keys_unknown(self):
512
503
        self.requireFeature(features.gpgme)
513
504
        my_gpg = gpg.GPGStrategy(FakeConfig())