test: add watchdog dracut module for each test run for consistency

diff --git a/modules.d/80test/module-setup.sh b/modules.d/80test/module-setup.sh
index 42f3af050050e57bf9819f680ebdfa81cc666b84..7560e05e596d4ec5ab09c8e55b73c0a7989d7a8c 100755 (executable)
--- a/modules.d/80test/module-setup.sh
+++ b/modules.d/80test/module-setup.sh
@@ -6,7 +6,7 @@ check() {
 }
 
 depends() {
-    echo "base debug qemu"
+    echo "base debug qemu watchdog"
 }
 
 installkernel() {

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 804c199cce2e33557d7b1ede6f3b76af2ad32d75..77266fb45992abb3c5ee65cb448053e39118e958 100755 (executable)
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -53,7 +53,6 @@ test_setup() {
 
     # make sure --omit-drivers does not filter out drivers using regexp to test for an earlier regression (assuming there is no one letter linux kernel module needed to run the test)
     test_dracut \
-        -a "watchdog" \
         --omit-drivers 'a b c d e f g h i j k l m n o p q r s t u v w x y z' \
         "$TESTDIR"/initramfs.testing
 }

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index b24c9e02a4a4a00cc6dcff273e8844177ad117bb..c64a582010978d2fd5cd5fa3d132c770fa897fed 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -76,7 +76,6 @@ test_setup() {
     fi
 
     test_dracut \
-        -a "watchdog" \
         -d "btrfs" \
         "$TESTDIR"/initramfs.testing
     rm -rf -- "$TESTDIR"/overlay

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index c17c11ae9a39b4a89754bb106245f4e72ac697ab..c851ea25c3f49cbc30c602c80a8700371078b9c4 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -402,7 +402,7 @@ test_setup() {
 
     # Make client's dracut image
     test_dracut \
-        -a "dmsquash-live watchdog ${USE_NETWORK}" \
+        -a "dmsquash-live ${USE_NETWORK}" \
         "$TESTDIR"/initramfs.testing
 
     (

diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index e87287fe93638079e4320651800feca35e1b3909..09be5d99d3eab2133c95bae61e7974626bfef2d5 100755 (executable)
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -335,7 +335,7 @@ test_setup() {
     echo -n test > /tmp/key
 
     test_dracut \
-        -a "watchdog ${USE_NETWORK}" \
+        -a "${USE_NETWORK}" \
         -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "./client.link" "/etc/systemd/network/01-client.link" \
         -i "/tmp/crypttab" "/etc/crypttab" \

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index a367637ebf46cf3bd49797b5d7cf4eec13ea7bc8..08185317c1cd91fcfdcf5c5aeddd45368b628b97 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -341,7 +341,7 @@ test_setup() {
     )
     # Make client's dracut image
     test_dracut \
-        -a "debug watchdog ${USE_NETWORK}" \
+        -a "${USE_NETWORK}" \
         "$TESTDIR"/initramfs.testing
 
     (