diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-04-11 08:31:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 08:31:14 +0200 |
| commit | 4ddff526409b38cecf5012fe6d4986d79793fb25 (patch) | |
| tree | a103d8212f21c9b3a472a9eb3b3ca1047b4d208f /test | |
| parent | network: fix use-of-uninitialized-value or null dereference (diff) | |
| parent | test: set longer watchdog timeout for timedated (diff) | |
| download | systemd-4ddff526409b38cecf5012fe6d4986d79793fb25.tar.xz systemd-4ddff526409b38cecf5012fe6d4986d79793fb25.zip | |
Merge pull request #12270 from yuwata/test-set-longer-timeout
test: set longer timeout
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-29-UDEV-ID_RENAMING/testsuite.sh | 4 | ||||
| -rwxr-xr-x | test/TEST-30-ONCLOCKCHANGE/test.sh | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/TEST-29-UDEV-ID_RENAMING/testsuite.sh b/test/TEST-29-UDEV-ID_RENAMING/testsuite.sh index 3d6f8a0bbe..9452c3a27b 100755 --- a/test/TEST-29-UDEV-ID_RENAMING/testsuite.sh +++ b/test/TEST-29-UDEV-ID_RENAMING/testsuite.sh @@ -18,7 +18,7 @@ SUBSYSTEM=="net", KERNEL=="lo", ENV{ID_RENAMING}="1" LABEL="lo_end" EOF -udevadm control --log-priority=debug --reload +udevadm control --log-priority=debug --reload --timeout=600 udevadm trigger --action=add --settle /sys/devices/virtual/net/lo udevadm info /sys/devices/virtual/net/lo sleep 1 @@ -38,7 +38,7 @@ STATE=$(systemctl show --property=ActiveState --value sys-devices-virtual-net-lo [[ $STATE == "active" ]] || exit 1 rm -f /run/udev/rules.d/50-testsuite.rules -udevadm control --reload +udevadm control --reload --timeout=600 echo OK > /testok diff --git a/test/TEST-30-ONCLOCKCHANGE/test.sh b/test/TEST-30-ONCLOCKCHANGE/test.sh index 25709410b9..ade3c6fa87 100755 --- a/test/TEST-30-ONCLOCKCHANGE/test.sh +++ b/test/TEST-30-ONCLOCKCHANGE/test.sh @@ -29,6 +29,12 @@ test_setup() { ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + # extend the watchdog + cat >$initdir/etc/systemd/system/systemd-timedated.service.d/watchdog.conf <<EOF +[Service] +WatchdogSec=10min +EOF + # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] |