b9a53a
From 60813b55f9b5b44b14f38bbc1b8c0d2b30e3f6c7 Mon Sep 17 00:00:00 2001
b9a53a
From: Frantisek Sumsal <frantisek@sumsal.cz>
b9a53a
Date: Mon, 1 Jul 2019 19:53:45 +0200
be3800
Subject: [PATCH] test: make sure the strace process is indeed dead
b9a53a
b9a53a
It may take a few moments for the strace process to properly terminate
b9a53a
and write all logs to the backing storage
b9a53a
b9a53a
(cherry picked from commit 56425e54a2140f47b4560b51c5db08aa2de199a6)
b9a53a
b9a53a
Related: #1808940
b9a53a
---
b9a53a
 test/TEST-36-NUMAPOLICY/test.sh      | 2 +-
b9a53a
 test/TEST-36-NUMAPOLICY/testsuite.sh | 3 +++
b9a53a
 2 files changed, 4 insertions(+), 1 deletion(-)
b9a53a
b9a53a
diff --git a/test/TEST-36-NUMAPOLICY/test.sh b/test/TEST-36-NUMAPOLICY/test.sh
b9a53a
index a0d8623e8e..f0a321e7a1 100755
b9a53a
--- a/test/TEST-36-NUMAPOLICY/test.sh
b9a53a
+++ b/test/TEST-36-NUMAPOLICY/test.sh
b9a53a
@@ -16,7 +16,7 @@ test_setup() {
b9a53a
         eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
b9a53a
 
b9a53a
         setup_basic_environment
b9a53a
-        inst_binary mktemp
b9a53a
+        dracut_install mktemp
b9a53a
 
b9a53a
         # mask some services that we do not want to run in these tests
b9a53a
         ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
b9a53a
diff --git a/test/TEST-36-NUMAPOLICY/testsuite.sh b/test/TEST-36-NUMAPOLICY/testsuite.sh
b9a53a
index a4134bdeca..daed8fcc1c 100755
b9a53a
--- a/test/TEST-36-NUMAPOLICY/testsuite.sh
b9a53a
+++ b/test/TEST-36-NUMAPOLICY/testsuite.sh
b9a53a
@@ -38,6 +38,8 @@ startStrace() {
b9a53a
 
b9a53a
 stopStrace() {
b9a53a
     kill -s TERM $COPROC_PID
b9a53a
+    # Make sure the strace process is indeed dead
b9a53a
+    while kill -0 $COPROC_PID 2>/dev/null; do sleep 0.1; done
b9a53a
 }
b9a53a
 
b9a53a
 startJournalctl() {
b9a53a
@@ -80,6 +82,7 @@ writeTestUnitNUMAPolicy() {
b9a53a
 pid1ReloadWithStrace() {
b9a53a
     startStrace
b9a53a
     systemctl daemon-reload
b9a53a
+    sleep $sleepAfterStart
b9a53a
     stopStrace
b9a53a
 }
b9a53a