summaryrefslogtreecommitdiff
path: root/test/TEST-05-RLIMITS
diff options
context:
space:
mode:
authorDan Streetman <ddstreet@canonical.com>2019-07-12 11:47:26 -0400
committerDan Streetman <ddstreet@canonical.com>2019-07-16 18:05:15 -0400
commitec4cab49c95d03d23cad9741685f3837a8ccaab4 (patch)
tree315c884c2c3e9e09af252b54297e2dca2d1a26cd /test/TEST-05-RLIMITS
parent26408c7d5f39ac5b7afb3902eb340917ae821c88 (diff)
downloadsystemd-ec4cab49c95d03d23cad9741685f3837a8ccaab4.tar.gz
test: add create_empty_image_rootdir() to simplify testcase setup
Almost all tests were manually mounting/unmounting $TESTDIR/root from the loopback image; this moves all that into test-functions so the test setup functions are simplier. Also add test_setup_cleanup() function, to cleanup what is mounted by create_empty_image_rootdir()
Diffstat (limited to 'test/TEST-05-RLIMITS')
-rwxr-xr-xtest/TEST-05-RLIMITS/test.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/test/TEST-05-RLIMITS/test.sh b/test/TEST-05-RLIMITS/test.sh
index 176014d270..159c1e0ea8 100755
--- a/test/TEST-05-RLIMITS/test.sh
+++ b/test/TEST-05-RLIMITS/test.sh
@@ -5,9 +5,7 @@ TEST_DESCRIPTION="Resource limits-related tests"
. $TEST_BASE_DIR/test-functions
test_setup() {
- create_empty_image
- mkdir -p $TESTDIR/root
- mount ${LOOPDEV}p1 $TESTDIR/root
+ create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
@@ -44,9 +42,6 @@ EOF
setup_testsuite
)
setup_nspawn_root
-
- ddebug "umount $TESTDIR/root"
- umount $TESTDIR/root
}
do_test "$@"