diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-07-24 09:31:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 09:31:17 -0700 |
| commit | 62b778180f46c3ee706657437b413acda098eef0 (patch) | |
| tree | a22c6c25941b3bf9b8b32044f51b6260963aa31d /tests/commands | |
| parent | fd7ff0d15674a4cd1100f660d55c0b20a151a557 (diff) | |
| parent | 70010c0225dbfdebe0813b74354283ba6fcee514 (diff) | |
Merge pull request #1252 from pazz/update-envelope-keys
fix: automatically update envelope gpg keys only if requested. see #1228
Diffstat (limited to 'tests/commands')
| -rw-r--r-- | tests/commands/utils_tests.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/commands/utils_tests.py b/tests/commands/utils_tests.py index c4e4805a..db304552 100644 --- a/tests/commands/utils_tests.py +++ b/tests/commands/utils_tests.py @@ -140,7 +140,7 @@ class TestSetEncrypt(unittest.TestCase): ui = utilities.make_ui() envelope = Envelope() envelope['To'] = 'ambig@example.com, test@example.com' - yield utils.set_encrypt(ui, envelope) + yield utils.update_keys(ui, envelope) self.assertTrue(envelope.encrypt) self.assertCountEqual( [f.fpr for f in envelope.encrypt_keys.values()], @@ -151,7 +151,7 @@ class TestSetEncrypt(unittest.TestCase): ui = utilities.make_ui() envelope = Envelope() envelope['Cc'] = 'ambig@example.com, test@example.com' - yield utils.set_encrypt(ui, envelope) + yield utils.update_keys(ui, envelope) self.assertTrue(envelope.encrypt) self.assertCountEqual( [f.fpr for f in envelope.encrypt_keys.values()], @@ -162,7 +162,7 @@ class TestSetEncrypt(unittest.TestCase): ui = utilities.make_ui() envelope = Envelope() envelope['Cc'] = 'foo@example.com, test@example.com' - yield utils.set_encrypt(ui, envelope) + yield utils.update_keys(ui, envelope) self.assertTrue(envelope.encrypt) self.assertCountEqual( [f.fpr for f in envelope.encrypt_keys.values()], @@ -173,7 +173,7 @@ class TestSetEncrypt(unittest.TestCase): ui = utilities.make_ui() envelope = Envelope() envelope['To'] = 'foo@example.com' - yield utils.set_encrypt(ui, envelope) + yield utils.update_keys(ui, envelope) self.assertFalse(envelope.encrypt) self.assertEqual(envelope.encrypt_keys, {}) @@ -187,7 +187,7 @@ class TestSetEncrypt(unittest.TestCase): account = _Account(encrypt_to_self=True, gpg_key=gpg_key) with mock.patch('alot.commands.thread.settings.get_account_by_address', mock.Mock(return_value=account)): - yield utils.set_encrypt(ui, envelope) + yield utils.update_keys(ui, envelope) self.assertTrue(envelope.encrypt) self.assertIn(FPR, envelope.encrypt_keys) self.assertEqual(gpg_key, envelope.encrypt_keys[FPR]) @@ -202,6 +202,6 @@ class TestSetEncrypt(unittest.TestCase): account = _Account(encrypt_to_self=False, gpg_key=gpg_key) with mock.patch('alot.commands.thread.settings.get_account_by_address', mock.Mock(return_value=account)): - yield utils.set_encrypt(ui, envelope) + yield utils.update_keys(ui, envelope) self.assertTrue(envelope.encrypt) self.assertNotIn(FPR, envelope.encrypt_keys) |