feature/wrappers-modify

2 files changed, 20 insertions, 27 deletions

diff --git a/src/mailman_pgp/mta/tests/test_bulk.py b/src/mailman_pgp/mta/tests/test_bulk.py
index 02c5bf2..e9f77d0 100644
--- a/src/mailman_pgp/mta/tests/test_bulk.py
+++ b/src/mailman_pgp/mta/tests/test_bulk.py
@@ -99,20 +99,17 @@ Subject: test
         out_wrapped = PGPWrapper(out_msg)
         self.assertTrue(out_wrapped.is_encrypted())
 
-        decrypted = out_wrapped.decrypt(self.list_key)
-        wrapped = PGPWrapper(decrypted)
-        self.assertTrue(wrapped.is_signed())
-        self.assertTrue(verifies(wrapped.verify(self.list_key.pubkey)))
+        decrypted = out_wrapped.copy().decrypt(self.list_key)
+        self.assertTrue(decrypted.is_signed())
+        self.assertTrue(verifies(decrypted.verify(self.list_key.pubkey)))
 
-        decrypted = out_wrapped.decrypt(self.anne_key)
-        wrapped = PGPWrapper(decrypted)
-        self.assertTrue(wrapped.is_signed())
-        self.assertTrue(verifies(wrapped.verify(self.list_key.pubkey)))
+        decrypted = out_wrapped.copy().decrypt(self.anne_key)
+        self.assertTrue(decrypted.is_signed())
+        self.assertTrue(verifies(decrypted.verify(self.list_key.pubkey)))
 
-        decrypted = out_wrapped.decrypt(self.bart_key)
-        wrapped = PGPWrapper(decrypted)
-        self.assertTrue(wrapped.is_signed())
-        self.assertTrue(verifies(wrapped.verify(self.list_key.pubkey)))
+        decrypted = out_wrapped.copy().decrypt(self.bart_key)
+        self.assertTrue(decrypted.is_signed())
+        self.assertTrue(verifies(decrypted.verify(self.list_key.pubkey)))
 
     def test_encrypt(self):
         with transaction():
@@ -129,9 +126,9 @@ Subject: test
         out_msg = agent.deliveries[0][1]
         wrapped = PGPWrapper(out_msg)
         self.assertTrue(wrapped.is_encrypted())
-        wrapped.decrypt(self.list_key)
-        wrapped.decrypt(self.anne_key)
-        wrapped.decrypt(self.bart_key)
+        wrapped.copy().decrypt(self.list_key)
+        wrapped.copy().decrypt(self.anne_key)
+        wrapped.copy().decrypt(self.bart_key)
 
     def test_sign(self):
         with transaction():
diff --git a/src/mailman_pgp/mta/tests/test_personalized.py b/src/mailman_pgp/mta/tests/test_personalized.py
index 7f4caa8..953ef55 100644
--- a/src/mailman_pgp/mta/tests/test_personalized.py
+++ b/src/mailman_pgp/mta/tests/test_personalized.py
@@ -89,13 +89,11 @@ Subject: test
         out_wrapped = PGPWrapper(out_msg)
         self.assertTrue(out_wrapped.is_encrypted())
 
-        decrypted = out_wrapped.decrypt(self.list_key)
-        wrapped = PGPWrapper(decrypted)
-        self.assertTrue(wrapped.is_signed())
+        decrypted = out_wrapped.copy().decrypt(self.list_key)
+        self.assertTrue(decrypted.is_signed())
 
-        decrypted = out_wrapped.decrypt(self.anne_key)
-        wrapped = PGPWrapper(decrypted)
-        self.assertTrue(wrapped.is_signed())
+        decrypted = out_wrapped.copy().decrypt(self.anne_key)
+        self.assertTrue(decrypted.is_signed())
 
     def test_encrypt(self):
         with transaction():
@@ -113,13 +111,11 @@ Subject: test
         out_wrapped = PGPWrapper(out_msg)
         self.assertTrue(out_wrapped.is_encrypted())
 
-        decrypted = out_wrapped.decrypt(self.list_key)
-        wrapped = PGPWrapper(decrypted)
-        self.assertFalse(wrapped.is_signed())
+        decrypted = out_wrapped.copy().decrypt(self.list_key)
+        self.assertFalse(decrypted.is_signed())
 
-        decrypted = out_wrapped.decrypt(self.anne_key)
-        wrapped = PGPWrapper(decrypted)
-        self.assertFalse(wrapped.is_signed())
+        decrypted = out_wrapped.copy().decrypt(self.anne_key)
+        self.assertFalse(decrypted.is_signed())
 
     def test_sign(self):
         with transaction():