From b99cd2fd12bc3a2c6b858e65182a47a4ef27dba2 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 11 Dec 2020 17:57:22 +0100
Subject: test suite: `mv tests/snippets tests/config`

---
 Changelog                                             |  1 +
 tests/config/dovecot/dhparams.pem                     |  8 ++++++++
 tests/config/dovecot/imapd.conf                       | 19 +++++++++++++++++++
 .../dovecot/interimap-required-capabilities.conf      |  3 +++
 tests/config/dovecot/lmtpd.conf                       |  7 +++++++
 tests/config/dovecot/ssl.conf                         |  4 ++++
 tests/preauth-plaintext/imapd                         |  2 +-
 tests/run                                             |  2 +-
 tests/snippets/dovecot/dhparams.pem                   |  8 --------
 tests/snippets/dovecot/imapd.conf                     | 19 -------------------
 .../dovecot/interimap-required-capabilities.conf      |  3 ---
 tests/snippets/dovecot/lmtpd.conf                     |  7 -------
 tests/snippets/dovecot/ssl.conf                       |  4 ----
 13 files changed, 44 insertions(+), 43 deletions(-)
 create mode 100644 tests/config/dovecot/dhparams.pem
 create mode 100644 tests/config/dovecot/imapd.conf
 create mode 100644 tests/config/dovecot/interimap-required-capabilities.conf
 create mode 100644 tests/config/dovecot/lmtpd.conf
 create mode 100644 tests/config/dovecot/ssl.conf
 delete mode 100644 tests/snippets/dovecot/dhparams.pem
 delete mode 100644 tests/snippets/dovecot/imapd.conf
 delete mode 100644 tests/snippets/dovecot/interimap-required-capabilities.conf
 delete mode 100644 tests/snippets/dovecot/lmtpd.conf
 delete mode 100644 tests/snippets/dovecot/ssl.conf

diff --git a/Changelog b/Changelog
index 83dea70..e21ccf7 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ interimap (0.5.5) upstream;
  - libinterimap: make $OPENSSL_VERSION global.
  - libinterimap: use Net::SSLeay::get_version() to get the protocol
    version string.
+ - test suite: `mv tests/snippets tests/config`
 
  -- Guilhem Moulin <guilhem@fripost.org>  Fri, 11 Dec 2020 14:55:53 +0100
 
diff --git a/tests/config/dovecot/dhparams.pem b/tests/config/dovecot/dhparams.pem
new file mode 100644
index 0000000..7734d2a
--- /dev/null
+++ b/tests/config/dovecot/dhparams.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA0J1dU8erRgIk4bMCBMLezjx32pcQpXrdNgl04dxZVxnJ5Ik2gGhA
+uQRbbZhAlHNHtFtp9s4TdQ3Ddrv9SuWXYul8U5BWbcxs4nOtwFU8912SfiuVr/kc
+4ok2zQ1hdMODtaqWS2ZKBmwcuk4QM6e7fMEAkuZX+Dtf2u8bG5G9B7OL5LggYtrP
+cFVNQDtfhs64D+sUKJLWkgeg5NH6nbf+0Gs5a8v3/urHKvoxdVScGmKzF+LsFsBm
+ycQjYeVtA9gLr41mo80rrFysUQqZtNkbdkaXOIA2r9JGTYex1l/XaediR8J94ck9
+dwAe2ubRqWcPjmoLJYQIPKiCbvXuJAd0wwIBAg==
+-----END DH PARAMETERS-----
diff --git a/tests/config/dovecot/imapd.conf b/tests/config/dovecot/imapd.conf
new file mode 100644
index 0000000..2b26451
--- /dev/null
+++ b/tests/config/dovecot/imapd.conf
@@ -0,0 +1,19 @@
+protocols = $protocols imap
+
+mail_plugins = $mail_plugins zlib
+protocol imap {
+    mail_plugins = $mail_plugins imap_zlib
+}
+
+service imap-login {
+    inet_listener imap {
+        port = 10143
+    }
+    inet_listener imaps {
+        port = 10993
+        ssl = yes
+    }
+}
+
+# we should avoid sending command lines that are too long
+imap_max_line_length = 8192
diff --git a/tests/config/dovecot/interimap-required-capabilities.conf b/tests/config/dovecot/interimap-required-capabilities.conf
new file mode 100644
index 0000000..10dd8e1
--- /dev/null
+++ b/tests/config/dovecot/interimap-required-capabilities.conf
@@ -0,0 +1,3 @@
+# strict minimum of IMAP capabilities required for interimap to work
+# (in particular, no LITERAL+, MULTIAPPEND, COMPRESS=DEFLATE, SASL-IR)
+imap_capability = IMAP4rev1 ENABLE UIDPLUS LIST-EXTENDED QRESYNC LIST-STATUS
diff --git a/tests/config/dovecot/lmtpd.conf b/tests/config/dovecot/lmtpd.conf
new file mode 100644
index 0000000..6aa8365
--- /dev/null
+++ b/tests/config/dovecot/lmtpd.conf
@@ -0,0 +1,7 @@
+protocols = $protocols lmtp
+
+service lmtp {
+    inet_listener lmtp {
+        port = 10024
+    }
+}
diff --git a/tests/config/dovecot/ssl.conf b/tests/config/dovecot/ssl.conf
new file mode 100644
index 0000000..2d68c80
--- /dev/null
+++ b/tests/config/dovecot/ssl.conf
@@ -0,0 +1,4 @@
+ssl = required
+ssl_cert = <dovecot.rsa.crt
+ssl_key = <dovecot.rsa.key
+ssl_dh = <dhparams.pem
diff --git a/tests/preauth-plaintext/imapd b/tests/preauth-plaintext/imapd
index 8f3ac30..6196f73 100755
--- a/tests/preauth-plaintext/imapd
+++ b/tests/preauth-plaintext/imapd
@@ -18,7 +18,7 @@ while (1) {
         die "accept: $!";
     };
 
-    # minimum CAPABILITY list, see tests/snippets/dovecot/interimap-required-capabilities.conf
+    # minimum CAPABILITY list, see tests/config/dovecot/interimap-required-capabilities.conf
     $conn->printflush("* PREAUTH [CAPABILITY IMAP4rev1 ENABLE UIDPLUS LIST-EXTENDED QRESYNC LIST-STATUS] IMAP4rev1 Server\r\n");
     my $x;
 
diff --git a/tests/run b/tests/run
index d216591..994c257 100755
--- a/tests/run
+++ b/tests/run
@@ -101,7 +101,7 @@ prepare() {
         if [ -f "$TESTDIR/$u.conf" ] || [ -L "$TESTDIR/$u.conf" ]; then
             cat >>"$home/.dovecot/config" <"$TESTDIR/$u.conf"
         fi
-        cp -aT -- "$BASEDIR/snippets/dovecot" "$home/.dovecot/conf.d"
+        cp -aT -- "$BASEDIR/config/dovecot" "$home/.dovecot/conf.d"
         cp -at "$home/.dovecot/conf.d" -- "$BASEDIR/certs/ca.crt" "$BASEDIR/certs"/dovecot.*
 
         proto="$(env -i "${ENVIRON[@]}" doveconf -c "$home/.dovecot/config" -h protocols)"
diff --git a/tests/snippets/dovecot/dhparams.pem b/tests/snippets/dovecot/dhparams.pem
deleted file mode 100644
index 7734d2a..0000000
--- a/tests/snippets/dovecot/dhparams.pem
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA0J1dU8erRgIk4bMCBMLezjx32pcQpXrdNgl04dxZVxnJ5Ik2gGhA
-uQRbbZhAlHNHtFtp9s4TdQ3Ddrv9SuWXYul8U5BWbcxs4nOtwFU8912SfiuVr/kc
-4ok2zQ1hdMODtaqWS2ZKBmwcuk4QM6e7fMEAkuZX+Dtf2u8bG5G9B7OL5LggYtrP
-cFVNQDtfhs64D+sUKJLWkgeg5NH6nbf+0Gs5a8v3/urHKvoxdVScGmKzF+LsFsBm
-ycQjYeVtA9gLr41mo80rrFysUQqZtNkbdkaXOIA2r9JGTYex1l/XaediR8J94ck9
-dwAe2ubRqWcPjmoLJYQIPKiCbvXuJAd0wwIBAg==
------END DH PARAMETERS-----
diff --git a/tests/snippets/dovecot/imapd.conf b/tests/snippets/dovecot/imapd.conf
deleted file mode 100644
index 2b26451..0000000
--- a/tests/snippets/dovecot/imapd.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-protocols = $protocols imap
-
-mail_plugins = $mail_plugins zlib
-protocol imap {
-    mail_plugins = $mail_plugins imap_zlib
-}
-
-service imap-login {
-    inet_listener imap {
-        port = 10143
-    }
-    inet_listener imaps {
-        port = 10993
-        ssl = yes
-    }
-}
-
-# we should avoid sending command lines that are too long
-imap_max_line_length = 8192
diff --git a/tests/snippets/dovecot/interimap-required-capabilities.conf b/tests/snippets/dovecot/interimap-required-capabilities.conf
deleted file mode 100644
index 10dd8e1..0000000
--- a/tests/snippets/dovecot/interimap-required-capabilities.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# strict minimum of IMAP capabilities required for interimap to work
-# (in particular, no LITERAL+, MULTIAPPEND, COMPRESS=DEFLATE, SASL-IR)
-imap_capability = IMAP4rev1 ENABLE UIDPLUS LIST-EXTENDED QRESYNC LIST-STATUS
diff --git a/tests/snippets/dovecot/lmtpd.conf b/tests/snippets/dovecot/lmtpd.conf
deleted file mode 100644
index 6aa8365..0000000
--- a/tests/snippets/dovecot/lmtpd.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-protocols = $protocols lmtp
-
-service lmtp {
-    inet_listener lmtp {
-        port = 10024
-    }
-}
diff --git a/tests/snippets/dovecot/ssl.conf b/tests/snippets/dovecot/ssl.conf
deleted file mode 100644
index 2d68c80..0000000
--- a/tests/snippets/dovecot/ssl.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-ssl = required
-ssl_cert = <dovecot.rsa.crt
-ssl_key = <dovecot.rsa.key
-ssl_dh = <dhparams.pem
-- 
cgit v1.2.3