2 files changed, 14 insertions, 10 deletions
diff --git a/src/mailman_pgp/archivers/tests/test_maildir.py b/src/mailman_pgp/archivers/tests/test_maildir.py
index 25fc194..876b2c9 100644
--- a/src/mailman_pgp/archivers/tests/test_maildir.py
+++ b/src/mailman_pgp/archivers/tests/test_maildir.py
@@ -18,6 +18,7 @@
 """"""
 import os
 import unittest
+from contextlib import ExitStack
 from mailbox import Maildir
 from tempfile import TemporaryDirectory
 
@@ -25,10 +26,10 @@ from mailman.app.lifecycle import create_list
 from mailman.testing.helpers import specialized_message_from_string as mfs
 
 from mailman_pgp.archivers.local_maildir import LocalMaildirArchiver
-from mailman_pgp.config import config
 from mailman_pgp.database import mm_transaction
 from mailman_pgp.model.list import PGPMailingList
 from mailman_pgp.pgp.mime import MIMEWrapper
+from mailman_pgp.testing.config import patch_config
 from mailman_pgp.testing.layers import PGPConfigLayer
 from mailman_pgp.testing.pgp import load_key
 
@@ -65,10 +66,11 @@ but the water deserves to be swum.
         LocalMaildirArchiver.archive_message(ordinary, self.msg)
 
     def test_archives(self):
-        with TemporaryDirectory() as maildir_dir:
-            self.addCleanup(config.set, 'archiving', 'maildir_dir',
-                            config.get('archiving', 'maildir_dir'))
-            config.set('archiving', 'maildir_dir', maildir_dir)
+        with ExitStack() as res:
+            maildir_dir = res.enter_context(TemporaryDirectory())
+            res.enter_context(patch_config('archiving', 'maildir_dir',
+                                           maildir_dir))
+
             LocalMaildirArchiver.archive_message(self.mlist, self.msg)
 
             list_dir = os.path.join(maildir_dir, self.mlist.fqdn_listname)
diff --git a/src/mailman_pgp/archivers/tests/test_mbox.py b/src/mailman_pgp/archivers/tests/test_mbox.py
index 50b7113..8af2b77 100644
--- a/src/mailman_pgp/archivers/tests/test_mbox.py
+++ b/src/mailman_pgp/archivers/tests/test_mbox.py
@@ -18,6 +18,7 @@
 """"""
 import os
 import unittest
+from contextlib import ExitStack
 from mailbox import mbox
 from tempfile import TemporaryDirectory
 
@@ -25,10 +26,10 @@ from mailman.app.lifecycle import create_list
 from mailman.testing.helpers import specialized_message_from_string as mfs
 
 from mailman_pgp.archivers.local_mbox import LocalMailboxArchiver
-from mailman_pgp.config import config
 from mailman_pgp.database import mm_transaction
 from mailman_pgp.model.list import PGPMailingList
 from mailman_pgp.pgp.mime import MIMEWrapper
+from mailman_pgp.testing.config import patch_config
 from mailman_pgp.testing.layers import PGPConfigLayer
 from mailman_pgp.testing.pgp import load_key
 
@@ -65,10 +66,11 @@ but the water deserves to be swum.
             LocalMailboxArchiver.archive_message(ordinary, self.msg)
 
     def test_archives(self):
-        with TemporaryDirectory() as mailbox_dir:
-            self.addCleanup(config.set, 'archiving', 'mailbox_dir',
-                            config.get('archiving', 'mailbox_dir'))
-            config.set('archiving', 'mailbox_dir', mailbox_dir)
+        with ExitStack() as res:
+            mailbox_dir = res.enter_context(TemporaryDirectory())
+            res.enter_context(patch_config('archiving', 'mailbox_dir',
+                                           mailbox_dir))
+
             LocalMailboxArchiver.archive_message(self.mlist, self.msg)
 
             list_dir = os.path.join(mailbox_dir, self.mlist.fqdn_listname)