]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: update test_create_image
authorLuca Boccassi <bluca@debian.org>
Tue, 22 Dec 2020 17:45:50 +0000 (17:45 +0000)
committerLuca Boccassi <bluca@debian.org>
Fri, 1 Jan 2021 21:33:16 +0000 (21:33 +0000)
Run mask_supporting_services, which was missing, and remove setup_nspawn_root which
is now already called outside test_create_image

test/TEST-01-BASIC/test.sh

index 58f6cd141429a2d2c880c8b13953fd5ef3aa22f3..58ad6f8fd2a5e7daf49e91046258f61094d1ac91 100755 (executable)
@@ -14,12 +14,12 @@ test_create_image() {
     (
         LOG_LEVEL=5
         setup_basic_environment
+        mask_supporting_services
 
         # install tests manually so the test is functional even when -Dinstall-tests=false
         mkdir -p $initdir/usr/lib/systemd/tests/testdata/units/
         cp -v $(dirname $0)/../units/{testsuite-01,end}.service $initdir/usr/lib/systemd/tests/testdata/units/
     )
-    setup_nspawn_root
 }
 
 do_test "$@" 01