diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-30 09:18:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 09:18:41 +0000 |
| commit | e9edddaaf2ab9d769d36adf00f97034db0a3cadf (patch) | |
| tree | 8d614f0a6a303c9f78605ca91fd04cf90b605d16 /test/e2e/libpod_suite_remote_test.go | |
| parent | b68b6f334d4a83de35d68cc359365b348e72ad6b (diff) | |
| parent | b496802413aecf95b0d2786cb6e13618b388a406 (diff) | |
| download | podman-e9edddaaf2ab9d769d36adf00f97034db0a3cadf.tar.gz podman-e9edddaaf2ab9d769d36adf00f97034db0a3cadf.tar.bz2 podman-e9edddaaf2ab9d769d36adf00f97034db0a3cadf.zip | |
Merge pull request #7799 from rhatdan/rootless
Make all Skips specify a reason
Diffstat (limited to 'test/e2e/libpod_suite_remote_test.go')
| -rw-r--r-- | test/e2e/libpod_suite_remote_test.go | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index 0a0b2799b..fa87302ee 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -24,16 +24,10 @@ func IsRemote() bool { } func SkipIfRemote(reason string) { - ginkgo.Skip("[remote]: " + reason) -} - -func SkipIfRootlessCgroupsV1() { -} - -func SkipIfRootless() { - if os.Geteuid() != 0 { - ginkgo.Skip("This function is not enabled for rootless podman") + if len(reason) < 5 { + panic("SkipIfRemote must specify a reason to skip") } + ginkgo.Skip("[remote]: " + reason) } // Podman is the exec call to podman on the filesystem |