2 files changed, 21 insertions, 9 deletions

diff --git a/src/mailman_pgp/testing/layers.py b/src/mailman_pgp/testing/layers.py
index 07eb386..34f6b1a 100644
--- a/src/mailman_pgp/testing/layers.py
+++ b/src/mailman_pgp/testing/layers.py
@@ -18,7 +18,8 @@ import contextlib
 import os
 from os.path import isfile
 
-from mailman.testing.layers import (ConfigLayer, RESTLayer, SMTPLayer)
+from mailman.testing.layers import (ConfigLayer, RESTLayer, SMTPLayer,
+                                    MockAndMonkeyLayer)
 from sqlalchemy.exc import SQLAlchemyError
 
 from mailman_pgp.config import config
@@ -59,6 +60,9 @@ def reset_pgp_soft():
         trans.commit()
 
 
+class PGPLayer:
+    pass
+
 # It's weird that ws have to do this, but for some reason nose2 test layers
 # don't work when ws create a mixin class with the two classmethods
 # and subclass both it and the respective Mailman Core test layer.
diff --git a/src/mailman_pgp/testing/mailman_pgp.cfg b/src/mailman_pgp/testing/mailman_pgp.cfg
index 871f429..c85d38a 100644
--- a/src/mailman_pgp/testing/mailman_pgp.cfg
+++ b/src/mailman_pgp/testing/mailman_pgp.cfg
@@ -19,23 +19,23 @@
 
 [db]
 # db path the PGP plugin will use to store list/user configuration (not keys!).
-url = sqlite:////$DATA_DIR/pgp.db
+url: sqlite:////$DATA_DIR/pgp.db
 
 
 [keydirs]
 # Key directory used to store user public keys.
-user_keydir = $DATA_DIR/pgp/user_keydir/
+user_keydir: $DATA_DIR/pgp/user_keydir/
 
 # Key directory used to store list keypairs.
-list_keydir = $DATA_DIR/pgp/list_keydir/
+list_keydir: $DATA_DIR/pgp/list_keydir/
 
 # Key directory used to store archive public keys.
-archive_keydir = $DATA_DIR/pgp/archive_keydir/
+archive_keydir: $DATA_DIR/pgp/archive_keydir/
 
 
 [keypairs]
 # Whether to autogenerate the list key on list creation.
-autogenerate = no
+autogenerate: no
 
 # Type of primary list key and its size.
 # Format: type:size
@@ -44,7 +44,7 @@ autogenerate = no
 # size is the key size or curve name for ECDSA, which can be one of:
 #     nistp256, nistp384, nistp521, brainpoolP256r1, brainpoolP384r1,
 #     brainpoolP512r1, secp256k1
-primary_key = ECDSA:secp256k1
+primary_key: ECDSA:secp256k1
 
 # Type of list encryption subkey and its size.
 # Format: type:size
@@ -53,9 +53,17 @@ primary_key = ECDSA:secp256k1
 # size is the key size or curve name for ECDH, which can be one of:
 #     nistp256, nistp384, nistp521, brainpoolP256r1, brainpoolP384r1,
 #     brainpoolP512r1, secp256k1
-sub_key = ECDH:secp256k1
+sub_key: ECDH:secp256k1
+
+# Shred keys on list deletion?
+shred: yes
 
 
 [queues]
 # The queue to which processed incoming messages are passed.
-in = in_default
\ No newline at end of file
+in: in_default
+
+
+[misc]
+# The lifetime for `key change` request confirmation.
+change_request_lifetime: 1d