Avoid running randomized tests on the build daemons.debian/0.5-1

3 files changed, 59 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 72145f9..86eb5d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ interimap (0.5-1) unstable; urgency=medium
 
   * d/control: Bump Standards-Version to 4.5.0 (no changes necessary).
   * d/patches: Remove patches applied upstream.
+  * d/patches: Avoid running randomized tests on the build daemons.
 
  -- Guilhem Moulin <guilhem@debian.org>  Wed, 29 Jan 2020 13:22:16 +0100
 
diff --git a/debian/patches/Skip-randomized-tests.patch b/debian/patches/Skip-randomized-tests.patch
new file mode 100644
index 0000000..dd7623f
--- /dev/null
+++ b/debian/patches/Skip-randomized-tests.patch
@@ -0,0 +1,57 @@
+commit 5bc242612a514d5091b1a05e5a087d54454e390a
+Author: Guilhem Moulin <guilhem@debian.org>
+Date:   Wed Jan 29 13:49:10 2020 +0100
+
+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
+the background, then random events (new messages, deletions, flag
+changes, etc.) are sent for for one minute, and the background process
+is later terminated and the mail stores compared.  The problem is how to
+stop the background process after the loop.  What's done right now is it
+waits for 5 seconds and sends a SIGTERM; unfortunately $n sec is
+arbitrary and might not be enough, depending on the machine and load.
+Ideally a SIGUSR1 would cause it to continue until a clean state is
+reached, then stop.
+
+These tests most sense in the context of upstream development, so for
+now we skip them in the Debian context.
+
+---
+ tests/list |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+--- a/tests/list
++++ b/tests/list
+@@ -40,8 +40,8 @@ repair  --repair
+     auth-noplaintext        abort when STARTTLS is not offered
+ 
+ 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
+@@ -51,11 +51,11 @@ split-set   Split large sets to avoid ex
+     tls-pin-fingerprint     pubkey fingerprint pinning
+     tls-protocols           force TLS protocol versions
+ 
+-. 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
++#. 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
diff --git a/debian/patches/series b/debian/patches/series
index 649d1d8..991f992 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Ignore-custom-lib-PATH.patch
 Mention-the-Debian-BTS-in-the-manpages.patch
+Skip-randomized-tests.patch