summaryrefslogtreecommitdiffstats
path: root/test/TEST-36-NUMAPOLICY/test.sh
diff options
context:
space:
mode:
authorDan Streetman <ddstreet@canonical.com>2019-08-17 18:20:56 +0200
committerDan Streetman <ddstreet@canonical.com>2019-08-17 18:28:57 +0200
commitf42296752959a4c741c1d980f340000e66743bf2 (patch)
tree8370a6728c76b073202658c42fa010d3094afce6 /test/TEST-36-NUMAPOLICY/test.sh
parenttest/test-functions: avoid stderr noise, only umount on cleanup if mountpoint (diff)
downloadsystemd-f42296752959a4c741c1d980f340000e66743bf2.tar.xz
systemd-f42296752959a4c741c1d980f340000e66743bf2.zip
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 '')
-rwxr-xr-xtest/TEST-36-NUMAPOLICY/test.sh7
1 files changed, 1 insertions, 6 deletions
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 "$@"