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

test: set longer timeout

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
 

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]