From: Luca Boccassi <bluca@debian.org>
Date: Tue, 22 Dec 2020 17:45:50 +0000 (+0000)
Subject: test: update test_create_image
X-Git-Tag: v248-rc1~433^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb64bec589c0f8aa03c1be99fbd9302ee695f196;p=thirdparty%2Fsystemd.git

test: update test_create_image

Run mask_supporting_services, which was missing, and remove setup_nspawn_root which
is now already called outside test_create_image
---

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index 58f6cd14142..58ad6f8fd2a 100755
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -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