From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 27 May 2019 22:21:43 +0000 (+0200)
Subject: tests: don't fail when a pid can't be killed.
X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=03460fe3d2657c626d406e57d75f6f9c6fa4338e;p=interimap.git

tests: don't fail when a pid can't be killed.

(Usually on ESRCH.)
---

diff --git a/tests/00-db-exclusive/run b/tests/00-db-exclusive/run
index 1ae27b6..1528b3b 100644
--- a/tests/00-db-exclusive/run
+++ b/tests/00-db-exclusive/run
@@ -9,8 +9,8 @@ interimap
 interimap --watch=60 & pid=$!
 cleanup() {
     # kill interimap process and its children
-    pkill -P "$pid" -TERM
-    kill -TERM "$pid"
+    pkill -P "$pid" -TERM || true
+    kill -TERM "$pid" || true
     wait
 }
 trap cleanup EXIT INT TERM
diff --git a/tests/07-sync-live-multi/run b/tests/07-sync-live-multi/run
index bf0d2f5..9dca2cf 100644
--- a/tests/07-sync-live-multi/run
+++ b/tests/07-sync-live-multi/run
@@ -15,12 +15,12 @@ interimap --config="config3" --watch=1 & pid3=$!
 
 abort() {
     # kill interimap process and its children
-    pkill -P "$pid" -TERM
-    kill -TERM "$pid"
-    pkill -P "$pid2" -TERM
-    kill -TERM "$pid2"
-    pkill -P "$pid3" -TERM
-    kill -TERM "$pid3"
+    pkill -P "$pid" -TERM || true
+    kill -TERM "$pid" || true
+    pkill -P "$pid2" -TERM || true
+    kill -TERM "$pid2" || true
+    pkill -P "$pid3" -TERM || true
+    kill -TERM "$pid3" || true
     wait
 }
 trap abort EXIT INT TERM
diff --git a/tests/07-sync-live/run b/tests/07-sync-live/run
index 1950e0b..00cd826 100644
--- a/tests/07-sync-live/run
+++ b/tests/07-sync-live/run
@@ -6,8 +6,8 @@ interimap --watch=1 & pid=$!
 
 abort() {
     # kill interimap process and its children
-    pkill -P "$pid" -TERM
-    kill -TERM "$pid"
+    pkill -P "$pid" -TERM || true
+    kill -TERM "$pid" || true
     wait
 }
 trap abort EXIT INT TERM