Update d/patches.

1 files changed, 17 insertions, 21 deletions

diff --git a/debian/patches/Skip-randomized-tests.patch b/debian/patches/Skip-randomized-tests.patch
index 14b4ba0..12090e5 100644
--- a/debian/patches/Skip-randomized-tests.patch
+++ b/debian/patches/Skip-randomized-tests.patch
@@ -1,6 +1,6 @@
 From: Guilhem Moulin <guilhem@debian.org>
 Date: Wed, 29 Jan 2020 13:49:10 +0100
-Subject: Avoid running randomized tests on the build daemons
+Subject: Avoid running randomized tests on the build daemons.
 
 These tests are racy and can fail in subtle ways depending on the
 machine load and speed.  Basically `interimap --watch=1` is spawnedin
@@ -18,41 +18,37 @@ now we skip them in the Debian context.
 
 Forwarded: not-needed
 ---
- tests/list | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
+ tests/interimap.list | 8 --------
+ tests/pullimap.list  | 2 --
+ 2 files changed, 10 deletions(-)
 
-diff --git a/tests/list b/tests/list
-index d1058ba..d6b3ec0 100644
---- a/tests/list
-+++ b/tests/list
-@@ -41,8 +41,8 @@ repair  --repair
+diff --git a/tests/interimap.list b/tests/interimap.list
+index 559daed..61cb37f 100644
+--- a/tests/interimap.list
++++ b/tests/interimap.list
+@@ -41,8 +41,6 @@ repair  --repair
      preauth-plaintext       abort on MiTM via PREAUTH greeting
  
  compress    COMPRESS=DEFLATE
 -condstore   CONDSTORE
 -split-set   Split large sets to avoid extra-long command lines
-+#condstore   CONDSTORE
-+#split-set   Split large sets to avoid extra-long command lines
  
  . SSL/TLS
      starttls-logindisabled  LOGINDISABLED STARTTLS
-@@ -56,11 +56,11 @@ split-set   Split large sets to avoid extra-long command lines
+@@ -55,9 +53,3 @@ split-set   Split large sets to avoid extra-long command lines
+     tls-sni                 TLS servername extension (SNI)
      tls-protocols           force TLS protocol versions
      tls-ciphers             force TLS cipher list/suites
- 
+-
 -. Live synchronization (60s)
 -    sync-live            local/remote simulation
 -    sync-live-crippled   local/remote simulation (crippled remote)
 -    sync-live-tls        local/remote simulation (TLS remote)
 -    sync-live-multi      local/remote1+remote2+remote3 simulation (3 local namespaces)
--
+diff --git a/tests/pullimap.list b/tests/pullimap.list
+index f4304b9..e69de29 100644
+--- a/tests/pullimap.list
++++ b/tests/pullimap.list
+@@ -1,2 +0,0 @@
 -. pullimap
 -    ... pullimap
-+#. Live synchronization (60s)
-+#    sync-live            local/remote simulation
-+#    sync-live-crippled   local/remote simulation (crippled remote)
-+#    sync-live-tls        local/remote simulation (TLS remote)
-+#    sync-live-multi      local/remote1+remote2+remote3 simulation (3 local namespaces)
-+#
-+#. pullimap
-+#    ... pullimap