From: Michal Schmidt Date: Fri, 25 Jan 2013 18:49:19 +0000 (+0100) Subject: test: use non-blocking systemctl calls in testsuite.service X-Git-Tag: v198~406 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e8a66f4af296dc1dd4879a1401eb42bf7b7aeb01;p=elogind.git test: use non-blocking systemctl calls in testsuite.service "systemctl poweroff" called from testsuite.service will cause this unit itself to stop. To avoid deadlock, the call must not be synchronous. --- diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index eb6a80a07..9ab0a6fce 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -141,7 +141,7 @@ After=multi-user.target [Service] ExecStart=/bin/bash -c 'set -x; systemctl --failed --no-legend --no-pager > /failed ; echo OK > /testok; while : ;do echo "testsuite service waiting for journal to move to /var/log/journal" > /dev/console ; for i in /var/log/journal/*;do [ -d "\$i" ] && echo "\$i" && break 2; done; sleep 1; done; sleep 1; exit 0;' -ExecStopPost=/usr/bin/systemctl poweroff +ExecStopPost=/usr/bin/systemctl poweroff --no-block Type=oneshot EOF mkdir -p $initdir/etc/systemd/system/testsuite.target.wants diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh index 790dc3074..a0e4d6580 100755 --- a/test/TEST-02-CRYPTSETUP/test.sh +++ b/test/TEST-02-CRYPTSETUP/test.sh @@ -140,7 +140,7 @@ After=multi-user.target [Service] ExecStart=/bin/bash -c 'set -x; systemctl --failed --no-legend --no-pager > /failed ; echo OK > /testok; while : ;do systemd-cat echo "testsuite service waiting for /var/log/journal" ; echo "testsuite service waiting for journal to move to /var/log/journal" > /dev/console ; for i in /var/log/journal/*;do [ -d "\$i" ] && echo "\$i" && break 2; done; sleep 1; done; sleep 1; exit 0;' -ExecStopPost=/usr/bin/systemctl poweroff +ExecStopPost=/usr/bin/systemctl poweroff --no-block Type=oneshot EOF mkdir -p $initdir/etc/systemd/system/testsuite.target.wants