From d4ca13f7c0d0af7d1b8f88671548f7aa99cb1b10 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 30 Sep 2020 08:57:50 -0400 Subject: Distinguish userns vs containerized tests The systemd test was inaccurately being skipped when a userns env. var. flag was set. At best this is confusing to new developers, and at worse it actively blocks an otherwise legitimate class of tests. Improve the accuracy of skip-logic by adding/using a purpose built set of functions. Signed-off-by: Chris Evich --- test/e2e/systemd_test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'test/e2e/systemd_test.go') diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index 4be8443e3..9e717a0eb 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -48,9 +48,7 @@ WantedBy=multi-user.target It("podman start container by systemd", func() { SkipIfRootless("rootless can not write to /etc") - if os.Getenv("SKIP_USERNS") != "" { - Skip("Skip userns tests.") - } + SkipIfContainerized("test does not have systemd as pid 1") sys_file := ioutil.WriteFile("/etc/systemd/system/redis.service", []byte(systemd_unit_file), 0644) Expect(sys_file).To(BeNil()) -- cgit v1.2.3-54-g00ecf