aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2019-12-15 03:43:28 +0100
committerGuilhem Moulin <guilhem@fripost.org>2019-12-15 03:45:48 +0100
commit97b077be640071363918a0a27b0acfddd114ff1a (patch)
treed4dfe820e5bc495bcf8770b701646067c83c306e /debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch
parente1fadaaa8f8762a10ab24bb278759f3223837002 (diff)
Apply patches from master.debian/0.5_rc-2
In an attempt to fix FTBFS (`make -j4 test` failure) on the buildds.
Diffstat (limited to 'debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch')
-rw-r--r--debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch b/debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch
new file mode 100644
index 0000000..76b678b
--- /dev/null
+++ b/debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch
@@ -0,0 +1,68 @@
+From a7517e35cf0c835fcb68db56d8634fab9b4d5f0d Mon Sep 17 00:00:00 2001
+From: Guilhem Moulin <guilhem@fripost.org>
+Date: Sun, 15 Dec 2019 03:35:51 +0100
+Subject: [PATCH 1/2] tests/*/t: Increase timeout from 2 to 5s after background
+ syncs.
+
+---
+ tests/condstore/t | 2 +-
+ tests/pullimap/t | 2 +-
+ tests/sync-live-multi/t | 2 +-
+ tests/sync-live/t | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/condstore/t b/tests/condstore/t
+index d4da50f..1963b2b 100644
+--- a/tests/condstore/t
++++ b/tests/condstore/t
+@@ -31,7 +31,7 @@ while [ $(date +%s) -le $timer ]; do
+ doveadm -u "$u" flags "$a" "$f" mailbox "INBOX" "${seqs//$'\n'/,}"
+ sleep "0.0$(shuf -n1 -i10-99)" # 10 to 99ms
+ done
+-sleep 2
++sleep 5
+
+ ptree_abort $PID
+ trap - EXIT INT TERM
+diff --git a/tests/pullimap/t b/tests/pullimap/t
+index 79da3e0..115432d 100644
+--- a/tests/pullimap/t
++++ b/tests/pullimap/t
+@@ -123,7 +123,7 @@ while [ $(date +%s) -le $timer ]; do
+ sleep "$s"
+ done
+
+-sleep 2
++sleep 5
+ ptree_abort $PID
+ trap - EXIT INT TERM
+
+diff --git a/tests/sync-live-multi/t b/tests/sync-live-multi/t
+index 9b129ec..ba7f326 100644
+--- a/tests/sync-live-multi/t
++++ b/tests/sync-live-multi/t
+@@ -96,7 +96,7 @@ done
+ # wait a little longer so interimap has time to run loop() again and
+ # synchronize outstanding changes, then terminate the processes we
+ # started above
+-sleep 2
++sleep 5
+
+ ptree_abort ${PID[@]}
+ trap - EXIT INT TERM
+diff --git a/tests/sync-live/t b/tests/sync-live/t
+index 19d1e08..5f5b291 100644
+--- a/tests/sync-live/t
++++ b/tests/sync-live/t
+@@ -65,7 +65,7 @@ done
+ # wait a little longer so interimap has time to run loop() again and
+ # synchronize outstanding changes, then terminate the process we started
+ # above
+-sleep 2
++sleep 5
+
+ ptree_abort $PID
+ trap - EXIT INT TERM
+--
+2.24.0
+