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 1ae27b665da0db6b29e957fb57046abe5acbadfa..1528b3bae91fd9e81146d4a1b06961311bf21abe 100644 (file)
--- 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 bf0d2f54182f4d360342e5369e5c4811c337f9c4..9dca2cf46436a1f034aae1b921ffd55e054a8bed 100644 (file)
--- 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 1950e0b03c15ab5dc7d11e4be8694a67d0378523..00cd826c3e631b13dec03033ec2445eef359f1b0 100644 (file)
--- 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