1 files changed, 87 insertions, 0 deletions

diff --git a/src/mailman_pgp/commands/tests/test_key.py b/src/mailman_pgp/commands/tests/test_key.py
index d0ff7e9..612f13f 100644
--- a/src/mailman_pgp/commands/tests/test_key.py
+++ b/src/mailman_pgp/commands/tests/test_key.py
@@ -588,6 +588,42 @@ class TestAfterSubscription(unittest.TestCase):
         decrypted = confirm_wrapped.decrypt(self.bart_new_key)
         self.assertIn('key confirm', decrypted['subject'])
 
+    def test_change_encrypted(self):
+        bart = getUtility(IUserManager).create_address('bart@example.com',
+                                                       'Bart Person')
+
+        with transaction() as t:
+            pgp_address = PGPAddress(bart)
+            pgp_address.key = self.bart_key.pubkey
+            pgp_address.key_confirmed = True
+            t.add(pgp_address)
+
+        message = _create_mixed('bart@example.com', 'test@example.com',
+                                'key change')
+        wrapped_message = MIMEWrapper(message)
+        message = wrapped_message.attach_key(self.bart_new_key.pubkey)
+        wrapped_message = MIMEWrapper(message)
+        message = wrapped_message.encrypt(self.pgp_list.pubkey)
+
+        mm_config.switchboards['command'].enqueue(message,
+                                                  listid='test.example.com')
+        make_testable_runner(CommandRunner, 'command').run()
+
+        items = get_queue_messages('virgin', expected_count=2)
+        if items[0].msg['Subject'] == 'The results of your email commands':
+            results = items[0].msg
+            confirm_request = items[1].msg
+        else:
+            results = items[1].msg
+            confirm_request = items[0].msg
+
+        self.assertIn('Key change request received.', results.get_payload())
+
+        confirm_wrapped = PGPWrapper(confirm_request)
+        self.assertTrue(confirm_wrapped.is_encrypted())
+        decrypted = confirm_wrapped.decrypt(self.bart_new_key)
+        self.assertIn('key confirm', decrypted['subject'])
+
     def test_change_confirm(self):
         bart = getUtility(IUserManager).create_address('bart@example.com',
                                                        'Bart Person')
@@ -706,3 +742,54 @@ class TestAfterSubscription(unittest.TestCase):
 
         self.assertIn('A pgp enabled address not found.',
                       results_msg.get_payload())
+
+
+@public
+class TestGeneral(unittest.TestCase):
+    layer = PGPConfigLayer
+
+    def setUp(self):
+        self.mlist = create_list('test@example.com', style_name='pgp-default')
+        self.pgp_list = PGPMailingList.for_list(self.mlist)
+        self.pgp_list.key = load_key('ecc_p256.priv.asc')
+
+    def test_receive(self):
+        message = _create_plain('bart@example.com', 'test@example.com',
+                                'key receive', '')
+        mm_config.switchboards['command'].enqueue(message,
+                                                  listid='test.example.com')
+        make_testable_runner(CommandRunner, 'command').run()
+        items = get_queue_messages('virgin', expected_count=2)
+        if items[0].msg['Subject'] == 'The results of your email commands':
+            pubkey_message = items[1].msg
+        else:
+            pubkey_message = items[0].msg
+
+        wrapped = PGPWrapper(pubkey_message)
+        self.assertTrue(wrapped.has_keys())
+        keys = list(wrapped.keys())
+        self.assertEqual(len(keys), 1)
+        self.assertEqual(keys[0].fingerprint, self.pgp_list.key.fingerprint)
+
+    def test_receive_extra_arg(self):
+        message = _create_plain('bart@example.com', 'test@example.com',
+                                'key receive extra arguments', '')
+        mm_config.switchboards['command'].enqueue(message,
+                                                  listid='test.example.com')
+        make_testable_runner(CommandRunner, 'command').run()
+        items = get_queue_messages('virgin', expected_count=1)
+        results_msg = items[0].msg
+
+        self.assertIn('Extraneous argument/s: extra,arguments',
+                      results_msg.get_payload())
+
+    def test_receive_no_email(self):
+        message = _create_plain('', 'test@example.com', 'key receive', '')
+        mm_config.switchboards['command'].enqueue(message,
+                                                  listid='test.example.com')
+        make_testable_runner(CommandRunner, 'command').run()
+        items = get_queue_messages('virgin', expected_count=1)
+        results_msg = items[0].msg
+
+        self.assertIn('No email to send list public key.',
+                      results_msg.get_payload())