test: introduce make_client_rootfs/make_server_rootfs

Test 72 NBD has the helper functions `make_client_rootfs` and
`make_server_rootfs` which makes the test easier to read.

Refactor the other tests and introduce the helper functions
`make_client_rootfs` and `make_server_rootfs` there as well.

diff --git a/test/TEST-60-NFS/test.sh b/test/TEST-60-NFS/test.sh
index 75979f2daf185daff2b767a89011d30cff97aab5..a3b1318ac681e366ac6a1c55f201ff06b4ca783e 100755 (executable)
--- a/test/TEST-60-NFS/test.sh
+++ b/test/TEST-60-NFS/test.sh
@@ -215,7 +215,7 @@ test_run() {
     fi
 }
 
-test_setup() {
+make_server_rootfs() {
     call_dracut --tmpdir "$TESTDIR" \
         --add-confdir test-root \
         -a "$USE_NETWORK url-lib nfs" \
@@ -255,6 +255,10 @@ test_setup() {
     inst_init ./client-init.sh "$initdir"
 
     build_ext4_image "$TESTDIR/server-rootfs" "$TESTDIR"/server.img dracut
+}
+
+test_setup() {
+    make_server_rootfs
 
     # Make client's dracut image
     test_dracut \

diff --git a/test/TEST-70-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh
index 6644eb1b4320aae32c0a19079e7632420d436cfb..c157d710c9c5b622eda2be820443860095e1a141 100755 (executable)
--- a/test/TEST-70-ISCSI/test.sh
+++ b/test/TEST-70-ISCSI/test.sh
@@ -121,8 +121,7 @@ test_check() {
     fi
 }
 
-test_setup() {
-    # Create client root filesystem
+make_client_rootfs() {
     build_client_rootfs "$TESTDIR/overlay/source"
     inst_multiple ip grep setsid
     mkdir -p -- "$TESTDIR"/overlay/source/var/lib/nfs/rpc_pipefs
@@ -153,8 +152,9 @@ test_setup() {
         -initrd "$TESTDIR"/initramfs.makeroot
     test_marker_check dracut-root-block-created
     rm -- "$TESTDIR"/marker.img
+}
 
-    # Create server root filesystem
+make_server_rootfs() {
     call_dracut --tmpdir "$TESTDIR" \
         --add-confdir test-root \
         -a "$USE_NETWORK" \
@@ -172,6 +172,11 @@ test_setup() {
 
     build_ext4_image "$TESTDIR/server-rootfs" "$TESTDIR"/server.img dracut
     rm -rf "$TESTDIR"/server-rootfs
+}
+
+test_setup() {
+    make_client_rootfs
+    make_server_rootfs
 
     # Make server's dracut image
     call_dracut \

diff --git a/test/TEST-71-ISCSI-MULTI/test.sh b/test/TEST-71-ISCSI-MULTI/test.sh
index 0421f39986d679c3f94d36c51ce9defca3720c38..22a0a66b85dbe3e6802f94c4462b214eed8fa935 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/test.sh
+++ b/test/TEST-71-ISCSI-MULTI/test.sh
@@ -129,8 +129,7 @@ test_check() {
     fi
 }
 
-test_setup() {
-    # Create client root filesystem
+make_client_rootfs() {
     rm -rf -- "$TESTDIR"/overlay
     build_client_rootfs "$TESTDIR/overlay/source"
     inst_multiple ip grep setsid
@@ -162,8 +161,9 @@ test_setup() {
         -initrd "$TESTDIR"/initramfs.makeroot
     test_marker_check dracut-root-block-created
     rm -- "$TESTDIR"/marker.img
+}
 
-    # Create server root filesystem
+make_server_rootfs() {
     call_dracut --tmpdir "$TESTDIR" \
         --add-confdir test-root \
         -a "$USE_NETWORK iscsi" \
@@ -182,6 +182,11 @@ test_setup() {
 
     build_ext4_image "$TESTDIR/server-rootfs" "$TESTDIR"/server.img dracut
     rm -rf "$TESTDIR"/server-rootfs
+}
+
+test_setup() {
+    make_client_rootfs
+    make_server_rootfs
 
     # Make client's dracut image
     test_dracut \