picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12270 from yuwata/test-set-longer-timeout 

test: set longer timeout
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-04-11 08:31:14 +02:00 committed by GitHub
parent 86a3d44de5 a2fbac5875
commit 4ddff52640
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/TEST-29-UDEV-ID_RENAMING/testsuite.sh
View File

@ -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

6
test/TEST-30-ONCLOCKCHANGE/test.sh
View File

@ -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]