test: TEST-33 and TEST-36 should use create_empty_image_rootdir

This recently added function handles mkdir and mounting of the empty image,
as well as umounting after test_setup.

diff --git a/test/TEST-33-CLEAN-UNIT/test.sh b/test/TEST-33-CLEAN-UNIT/test.sh
index 44082af4d4b2ee368ac1e8bc9c59ea210ccd2147..aeda69baae4f682e189e3b4b188ed253eba2f868 100755 (executable)
--- a/test/TEST-33-CLEAN-UNIT/test.sh
+++ b/test/TEST-33-CLEAN-UNIT/test.sh
@@ -7,9 +7,7 @@ TEST_DESCRIPTION="test CleanUnit"
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
-    create_empty_image
-    mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $TESTDIR/root
+    create_empty_image_rootdir
 
     (
         LOG_LEVEL=5
@@ -41,9 +39,6 @@ EOF
         setup_testsuite
     ) || return 1
     setup_nspawn_root
-
-    ddebug "umount $TESTDIR/root"
-    umount $TESTDIR/root
 }
 
 do_test "$@"

diff --git a/test/TEST-36-NUMAPOLICY/test.sh b/test/TEST-36-NUMAPOLICY/test.sh
index f0a321e7a16a94094664e6aedd6bf11d922ddd06..5e775b2d5ad00b1aacd43838e5998da1c2bac5dc 100755 (executable)
--- a/test/TEST-36-NUMAPOLICY/test.sh
+++ b/test/TEST-36-NUMAPOLICY/test.sh
@@ -7,9 +7,7 @@ QEMU_OPTIONS="-numa node,nodeid=0"
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
-    create_empty_image
-    mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $TESTDIR/root
+    create_empty_image_rootdir
 
     (
         LOG_LEVEL=5
@@ -43,9 +41,6 @@ EOF
         setup_testsuite
     ) || return 1
     setup_nspawn_root
-
-    ddebug "umount $TESTDIR/root"
-    umount $TESTDIR/root
 }
 
 do_test "$@"