diff options
| author | Dan Streetman <ddstreet@canonical.com> | 2019-08-17 12:20:56 -0400 |
|---|---|---|
| committer | Dan Streetman <ddstreet@canonical.com> | 2019-08-17 12:28:57 -0400 |
| commit | f42296752959a4c741c1d980f340000e66743bf2 (patch) | |
| tree | 8370a6728c76b073202658c42fa010d3094afce6 /test | |
| parent | 9e19a8b02848d63b34d68f8ecfdf028ec4ea4833 (diff) | |
| download | systemd-f42296752959a4c741c1d980f340000e66743bf2.tar.gz | |
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.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-33-CLEAN-UNIT/test.sh | 7 | ||||
| -rwxr-xr-x | test/TEST-36-NUMAPOLICY/test.sh | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/test/TEST-33-CLEAN-UNIT/test.sh b/test/TEST-33-CLEAN-UNIT/test.sh index 44082af4d4..aeda69baae 100755 --- 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 f0a321e7a1..5e775b2d5a 100755 --- 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 "$@" |