diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-19 08:30:05 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-19 08:30:05 -0700 |
commit | a1299f506d9b93824fae737f0f68a19adaf2bde1 (patch) | |
tree | ff27a306055f4eb6a1b57455cd15d3c7fe6eccf9 /test/e2e/libpod_suite_test.go | |
parent | ac523cbe2b257e13c7b3b823c8de83e44052ffaf (diff) | |
parent | 4ac08d3aa1882851d4a03aa1e53c47c6fb173958 (diff) | |
download | podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.tar.gz podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.tar.bz2 podman-a1299f506d9b93824fae737f0f68a19adaf2bde1.zip |
Merge pull request #2704 from giuseppe/fix-some-rootless
tests: fix rootless tests
Diffstat (limited to 'test/e2e/libpod_suite_test.go')
-rw-r--r-- | test/e2e/libpod_suite_test.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 1a3f37e23..685a08340 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -14,12 +14,23 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/inspect" . "github.com/containers/libpod/test/utils" + "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" ) -func SkipIfRemote() {} +func SkipIfRemote() { + if os.Geteuid() != 0 { + ginkgo.Skip("This function is not enabled for rootless podman") + } +} + +func SkipIfRootless() { + if os.Geteuid() != 0 { + ginkgo.Skip("This function is not enabled for rootless podman") + } +} // Podman is the exec call to podman on the filesystem func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration { |