Merge pull request #1048

systemtests: wait for mariadb shutdown
bareos · Jan 27, 2022 · a098fca · a098fca
2 parents 4b792f2 + cc0ffbf
commit a098fca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 - tests: simplify test coverage analysis [PR #1010]
 - docs: Add chapter for mariabackup db plugin [PR #1016]
 - dird: extend the list command to be able to query volumes and pools by ID [PR #1041]
+- systemtests: wait for mariadb shutdown [PR #1048]
 
 ### Changed
 

diff --git a/systemtests/tests/py2plug-fd-mariabackup/testrunner b/systemtests/tests/py2plug-fd-mariabackup/testrunner
@@ -28,8 +28,12 @@ JobName=backup-bareos-fd
 "${rscripts}"/setup
 
 shutdown_mysql_server(){
-[ -f "mysql/mysqld.pid" ] && kill "$(cat mysql/mysqld.pid)" || :
-[ -f "mysql/data/${HOSTNAME}.pid" ] && kill "$(cat mysql/data/${HOSTNAME}.pid)" || :
+for f in mysql/mysqld.pid "mysql/data/${HOSTNAME}.pid"; do
+  [ ! -r "$f" ] && continue
+  pid="$(cat "$f")"
+  kill "$pid"
+  wait "$pid"
+done
 }
 
 startup_mysql_server(){