test: correctly mask supporting services in tests, take adamlaska#2

mrc0mmand · bluca · commit eb70d9450c48 · 2021-06-24T16:26:19.000+01:00
Due to a little misunderstanding the last patch doesn't work as expected, since test_create_image() is called only for the first image (usually TEST-01-BASIC), and all subsequent images are then (possibly) modified with test_append_files(). Follow-up to 179ca4d.
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
@@ -9,18 +9,6 @@ TEST_REQUIRE_INSTALL_TESTS=0
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
-# Explicitly override the default test_create_image() function to avoid the
-# call to mask_supporting_services(), since we want to run them in TEST-01-BASIC
-test_create_image() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        setup_basic_environment
-    )
-}
-
 test_append_files() {
     # install tests manually so the test is functional even when -Dinstall-tests=false
     local dst="${1:?}/usr/lib/systemd/tests/testdata/units/"
diff --git a/test/test-functions b/test/test-functions
@@ -2416,7 +2416,6 @@ test_create_image() {
     (
         LOG_LEVEL=5
         setup_basic_environment
-        mask_supporting_services
     )
 }
 
@@ -2467,6 +2466,13 @@ test_setup() {
         fi
 
         mount_initdir
+        # We want to test all services in TEST-01-BASIC, but mask them in
+        # all other tests
+        if [[ "${TESTID:?}" != "01" ]]; then
+            dinfo "Masking supporting services"
+            mask_supporting_services
+        fi
+
         if [ "$hook_defined" -eq 0 ]; then
             test_append_files "${initdir:?}"
         fi

Original file line number	Diff line number	Diff line change
`@@ -2416,7 +2416,6 @@ test_create_image() {`
`2416`	`2416`	`(`
`2417`	`2417`	`LOG_LEVEL=5`
`2418`	`2418`	`setup_basic_environment`
`2419`		`- mask_supporting_services`
`2420`	`2419`	`)`
`2421`	`2420`	`}`
`2422`	`2421`
`@@ -2467,6 +2466,13 @@ test_setup() {`
`2467`	`2466`	`fi`
`2468`	`2467`
`2469`	`2468`	`mount_initdir`
	`2469`	`+ # We want to test all services in TEST-01-BASIC, but mask them in`
	`2470`	`+ # all other tests`
	`2471`	`+ if [[ "${TESTID:?}" != "01" ]]; then`
	`2472`	`+ dinfo "Masking supporting services"`
	`2473`	`+ mask_supporting_services`
	`2474`	`+ fi`
	`2475`	`+`
`2470`	`2476`	`if [ "$hook_defined" -eq 0 ]; then`
`2471`	`2477`	`test_append_files "${initdir:?}"`
`2472`	`2478`	`fi`