From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 17 Oct 2022 13:00:12 +0000 (+0200)
Subject: test: use SIGKILL to kill the container if necessary
X-Git-Tag: v252-rc2~8^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0c03d9ce13a5b706a33ffdd8e69fa6cad63358e;p=thirdparty%2Fsystemd.git

test: use SIGKILL to kill the container if necessary

TEST-69 uses a Python wrapper around the systemd-nspawn call, which on
error calls the `spawn.terminate()` method. However, with no arguments
it will only use SIGHUP and SIGINT signals - this might leave a stuck
container around, causing fails if the test is run again. With `force=True`
SIGKILL is used as well (if necessary).
---

diff --git a/test/test-shutdown.py b/test/test-shutdown.py
index 52207a46561..e181f976bea 100755
--- a/test/test-shutdown.py
+++ b/test/test-shutdown.py
@@ -90,7 +90,7 @@ def run(args):
     except Exception as e:
         logger.error(e)
         logger.info("killing child pid %d", console.pid)
-        console.terminate()
+        console.terminate(force=True)
 
     return ret