diff options
| author | Chris Evich <cevich@redhat.com> | 2020-09-30 08:57:50 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-09-30 13:33:57 -0400 |
| commit | d4ca13f7c0d0af7d1b8f88671548f7aa99cb1b10 (patch) | |
| tree | 7ec8552eae91a52ad0eb8938b84261faf32dd8bc /test/e2e/systemd_test.go | |
| parent | f32fa3dd599aaeef74c14a7f1c76e1d27e56d1dd (diff) | |
| download | podman-d4ca13f7c0d0af7d1b8f88671548f7aa99cb1b10.tar.gz podman-d4ca13f7c0d0af7d1b8f88671548f7aa99cb1b10.tar.bz2 podman-d4ca13f7c0d0af7d1b8f88671548f7aa99cb1b10.zip | |
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 <cevich@redhat.com>
Diffstat (limited to 'test/e2e/systemd_test.go')
| -rw-r--r-- | test/e2e/systemd_test.go | 4 |
1 files changed, 1 insertions, 3 deletions
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()) |