1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 01:55:32 +03:00

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.
This commit is contained in:
Dan Streetman 2019-08-17 12:20:56 -04:00
parent 9e19a8b028
commit f422967529
2 changed files with 2 additions and 12 deletions

View File

@ -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 "$@"

View File

@ -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 "$@"