opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 17:46:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

e2e tests: SkipIfRemote(): add a reason

Browse Source 
Now that Dan has added helpful comments to each SkipIfRemote,
let's take the next step and include those messages in the
Skip() output so someone viewing test results can easily
see if a remote test is skipped for a real reason or for
a FIXME.

This commit is the result of a simple:

   perl -pi -e 's;(SkipIfRemote)\(\)(\s+//\s+(.*))?;$1("$3");' *.go

in the test/e2e directory, with a few minor (manual) changes
in wording.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2020-09-23 08:09:31 -06:00
parent 3059bf8ef0
commit b7147afde9
40 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/build_test.go
View File

@ -89,7 +89,7 @@ var _ = Describe("Podman build", func() {
// Check that builds with different values for the squash options // Check that builds with different values for the squash options
// create the appropriate number of layers, then clean up after. // create the appropriate number of layers, then clean up after.
It("podman build basic alpine with squash", func() { It("podman build basic alpine with squash", func() {
SkipIfRemote() // FIXME: This is broken should be fixed SkipIfRemote("FIXME: This is broken should be fixed")
session := podmanTest.PodmanNoCache([]string{"build", "-f", "build/squash/Dockerfile.squash-a", "-t", "test-squash-a:latest", "build/squash"}) session := podmanTest.PodmanNoCache([]string{"build", "-f", "build/squash/Dockerfile.squash-a", "-t", "test-squash-a:latest", "build/squash"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -221,7 +221,7 @@ var _ = Describe("Podman build", func() {
}) })
It("podman build --http_proxy flag", func() { It("podman build --http_proxy flag", func() {
SkipIfRemote() // FIXME: This is broken should be fixed SkipIfRemote("FIXME: This is broken should be fixed")
os.Setenv("http_proxy", "1.2.3.4") os.Setenv("http_proxy", "1.2.3.4")
podmanTest.RestoreAllArtifacts() podmanTest.RestoreAllArtifacts()
dockerfile := `FROM docker.io/library/alpine:latest dockerfile := `FROM docker.io/library/alpine:latest

2
test/e2e/commit_test.go
View File

@ -210,7 +210,7 @@ var _ = Describe("Podman commit", func() {
It("podman commit with volume mounts and --include-volumes", func() { It("podman commit with volume mounts and --include-volumes", func() {
// We need to figure out how volumes are going to work correctly with the remote // We need to figure out how volumes are going to work correctly with the remote
// client. This does not currently work. // client. This does not currently work.
SkipIfRemote() // --testing Remote Volumes SkipIfRemote("--testing Remote Volumes")
s := podmanTest.Podman([]string{"run", "--name", "test1", "-v", "/tmp:/foo", "alpine", "date"}) s := podmanTest.Podman([]string{"run", "--name", "test1", "-v", "/tmp:/foo", "alpine", "date"})
s.WaitWithDefaultTimeout() s.WaitWithDefaultTimeout()
Expect(s.ExitCode()).To(Equal(0)) Expect(s.ExitCode()).To(Equal(0))

2
test/e2e/cp_test.go
View File

@ -141,7 +141,7 @@ var _ = Describe("Podman cp", func() {
}) })
It("podman cp stdin/stdout", func() { It("podman cp stdin/stdout", func() {
SkipIfRemote() // podman-remote cp not implemented yet SkipIfRemote("FIXME: podman-remote cp not implemented yet")
session := podmanTest.Podman([]string{"create", ALPINE, "ls", "foo"}) session := podmanTest.Podman([]string{"create", ALPINE, "ls", "foo"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))

2
test/e2e/create_test.go
View File

@ -346,7 +346,7 @@ var _ = Describe("Podman create", func() {
}) })
It("podman create --signature-policy", func() { It("podman create --signature-policy", func() {
SkipIfRemote() // SigPolicy not handled by remote SkipIfRemote("SigPolicy not handled by remote")
session := podmanTest.Podman([]string{"create", "--pull=always", "--signature-policy", "/no/such/file", ALPINE}) session := podmanTest.Podman([]string{"create", "--pull=always", "--signature-policy", "/no/such/file", ALPINE})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Not(Equal(0))) Expect(session.ExitCode()).To(Not(Equal(0)))

2
test/e2e/exec_test.go
View File

@ -285,7 +285,7 @@ var _ = Describe("Podman exec", func() {
}) })
It("podman exec preserves container groups with --user and --group-add", func() { It("podman exec preserves container groups with --user and --group-add", func() {
SkipIfRemote() // FIXME: This is broken SECCOMP Failues? SkipIfRemote("FIXME: This is broken SECCOMP Failues?")
dockerfile := `FROM fedora-minimal dockerfile := `FROM fedora-minimal
RUN groupadd -g 4000 first RUN groupadd -g 4000 first

2
test/e2e/info_test.go
View File

@ -79,7 +79,7 @@ var _ = Describe("Podman Info", func() {
if !rootless.IsRootless() { if !rootless.IsRootless() {
Skip("test of rootless_storage_path is only meaningful as rootless") Skip("test of rootless_storage_path is only meaningful as rootless")
} }
SkipIfRemote() // Only tests storage on local client SkipIfRemote("Only tests storage on local client")
oldHOME, hasHOME := os.LookupEnv("HOME") oldHOME, hasHOME := os.LookupEnv("HOME")
defer func() { defer func() {
if hasHOME { if hasHOME {

2
test/e2e/init_test.go
View File

@ -75,7 +75,7 @@ var _ = Describe("Podman init", func() {
}) })
It("podman init latest container", func() { It("podman init latest container", func() {
SkipIfRemote() // Testing --latest flag SkipIfRemote("--latest flag n/a")
session := podmanTest.Podman([]string{"create", "-d", ALPINE, "ls"}) session := podmanTest.Podman([]string{"create", "-d", ALPINE, "ls"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))

4
test/e2e/inspect_test.go
View File

@ -126,7 +126,7 @@ var _ = Describe("Podman inspect", func() {
}) })
It("podman inspect -l with additional input should fail", func() { It("podman inspect -l with additional input should fail", func() {
SkipIfRemote() // testing --latest flag SkipIfRemote("--latest flag n/a")
result := podmanTest.Podman([]string{"inspect", "-l", "1234foobar"}) result := podmanTest.Podman([]string{"inspect", "-l", "1234foobar"})
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(125)) Expect(result.ExitCode()).To(Equal(125))
@ -173,7 +173,7 @@ var _ = Describe("Podman inspect", func() {
}) })
It("podman inspect --latest with no container fails", func() { It("podman inspect --latest with no container fails", func() {
SkipIfRemote() // testing --latest flag SkipIfRemote("testing --latest flag")
session := podmanTest.Podman([]string{"inspect", "--latest"}) session := podmanTest.Podman([]string{"inspect", "--latest"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()

4
test/e2e/libpod_suite_remote_test.go
View File

@ -23,8 +23,8 @@ func IsRemote() bool {
return true return true
} }
func SkipIfRemote() { func SkipIfRemote(reason string) {
ginkgo.Skip("This function is not enabled for remote podman") ginkgo.Skip("[remote]: " + reason)
} }
func SkipIfRootless() { func SkipIfRootless() {

2
test/e2e/libpod_suite_test.go
View File

@ -16,7 +16,7 @@ func IsRemote() bool {
return false return false
} }
func SkipIfRemote() { func SkipIfRemote(string) {
} }
func SkipIfRootless() { func SkipIfRootless() {

4
test/e2e/libpod_suite_varlink_test.go
View File

@ -23,8 +23,8 @@ func IsRemote() bool {
return true return true
} }
func SkipIfRemote() { func SkipIfRemote(reason string) {
ginkgo.Skip("This function is not enabled for remote podman") ginkgo.Skip("[remote]: " + reason)
} }
func SkipIfRootless() { func SkipIfRootless() {

4
test/e2e/load_test.go
View File

@ -123,7 +123,7 @@ var _ = Describe("Podman load", func() {
}) })
It("podman load directory", func() { It("podman load directory", func() {
SkipIfRemote() // FIXME: Remote Load is broken. SkipIfRemote("FIXME: Remote Load is broken.")
outdir := filepath.Join(podmanTest.TempDir, "alpine") outdir := filepath.Join(podmanTest.TempDir, "alpine")
save := podmanTest.PodmanNoCache([]string{"save", "--format", "oci-dir", "-o", outdir, ALPINE}) save := podmanTest.PodmanNoCache([]string{"save", "--format", "oci-dir", "-o", outdir, ALPINE})
@ -227,7 +227,7 @@ var _ = Describe("Podman load", func() {
}) })
It("podman load localhost registry from dir", func() { It("podman load localhost registry from dir", func() {
SkipIfRemote() // FIXME: podman-remote load is currently broken. SkipIfRemote("FIXME: podman-remote load is currently broken.")
outfile := filepath.Join(podmanTest.TempDir, "load") outfile := filepath.Join(podmanTest.TempDir, "load")
setup := podmanTest.PodmanNoCache([]string{"tag", BB, "hello:world"}) setup := podmanTest.PodmanNoCache([]string{"tag", BB, "hello:world"})

2
test/e2e/logs_test.go
View File

@ -127,7 +127,7 @@ var _ = Describe("Podman logs", func() {
}) })
It("two containers showing short container IDs", func() { It("two containers showing short container IDs", func() {
SkipIfRemote() // FIXME: remote does not support multiple containers SkipIfRemote("FIXME: remote does not support multiple containers")
log1 := podmanTest.Podman([]string{"run", "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"}) log1 := podmanTest.Podman([]string{"run", "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
log1.WaitWithDefaultTimeout() log1.WaitWithDefaultTimeout()
Expect(log1.ExitCode()).To(Equal(0)) Expect(log1.ExitCode()).To(Equal(0))

4
test/e2e/manifest_test.go
View File

@ -102,7 +102,7 @@ var _ = Describe("Podman manifest", func() {
}) })
It("podman manifest annotate", func() { It("podman manifest annotate", func() {
SkipIfRemote() // Not supporting annotate on remote connections SkipIfRemote("Not supporting annotate on remote connections")
session := podmanTest.Podman([]string{"manifest", "create", "foo"}) session := podmanTest.Podman([]string{"manifest", "create", "foo"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -184,7 +184,7 @@ var _ = Describe("Podman manifest", func() {
}) })
It("podman manifest push purge", func() { It("podman manifest push purge", func() {
SkipIfRemote() // remote does not support --purge SkipIfRemote("remote does not support --purge")
session := podmanTest.Podman([]string{"manifest", "create", "foo"}) session := podmanTest.Podman([]string{"manifest", "create", "foo"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))

2
test/e2e/namespace_test.go
View File

@ -33,7 +33,7 @@ var _ = Describe("Podman namespaces", func() {
}) })
It("podman namespace test", func() { It("podman namespace test", func() {
SkipIfRemote() // FIXME This should work on Remote SkipIfRemote("FIXME This should work on Remote")
podman1 := podmanTest.Podman([]string{"--namespace", "test1", "run", "-d", ALPINE, "echo", "hello"}) podman1 := podmanTest.Podman([]string{"--namespace", "test1", "run", "-d", ALPINE, "echo", "hello"})
podman1.WaitWithDefaultTimeout() podman1.WaitWithDefaultTimeout()
Expect(podman1.ExitCode()).To(Equal(0)) Expect(podman1.ExitCode()).To(Equal(0))

2
test/e2e/network_create_test.go
View File

@ -137,7 +137,7 @@ var _ = Describe("Podman network create", func() {
}) })
It("podman network create with name and subnet", func() { It("podman network create with name and subnet", func() {
SkipIfRemote() // FIXME, this should work on --remote SkipIfRemote("FIXME, this should work on --remote")
var ( var (
results []network.NcList results []network.NcList
) )

4
test/e2e/play_kube_test.go
View File

@ -793,7 +793,7 @@ var _ = Describe("Podman generate kube", func() {
}) })
It("podman play kube seccomp container level", func() { It("podman play kube seccomp container level", func() {
SkipIfRemote() // FIXME This is broken SkipIfRemote("FIXME This is broken")
// expect play kube is expected to set a seccomp label if it's applied as an annotation // expect play kube is expected to set a seccomp label if it's applied as an annotation
jsonFile, err := podmanTest.CreateSeccompJson(seccompPwdEPERM) jsonFile, err := podmanTest.CreateSeccompJson(seccompPwdEPERM)
if err != nil { if err != nil {
@ -820,7 +820,7 @@ var _ = Describe("Podman generate kube", func() {
}) })
It("podman play kube seccomp pod level", func() { It("podman play kube seccomp pod level", func() {
SkipIfRemote() // FIXME: This should work with --remote SkipIfRemote("FIXME: This should work with --remote")
// expect play kube is expected to set a seccomp label if it's applied as an annotation // expect play kube is expected to set a seccomp label if it's applied as an annotation
jsonFile, err := podmanTest.CreateSeccompJson(seccompPwdEPERM) jsonFile, err := podmanTest.CreateSeccompJson(seccompPwdEPERM)
if err != nil { if err != nil {

8
test/e2e/pod_infra_container_test.go
View File

@ -225,7 +225,7 @@ var _ = Describe("Podman pod create", func() {
}) })
It("podman pod container can override pod pid NS", func() { It("podman pod container can override pod pid NS", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
session := podmanTest.Podman([]string{"pod", "create", "--share", "pid"}) session := podmanTest.Podman([]string{"pod", "create", "--share", "pid"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -257,7 +257,7 @@ var _ = Describe("Podman pod create", func() {
}) })
It("podman pod container can override pod not sharing pid", func() { It("podman pod container can override pod not sharing pid", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
session := podmanTest.Podman([]string{"pod", "create", "--share", "net"}) session := podmanTest.Podman([]string{"pod", "create", "--share", "net"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -283,7 +283,7 @@ var _ = Describe("Podman pod create", func() {
}) })
It("podman pod container can override pod ipc NS", func() { It("podman pod container can override pod ipc NS", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
session := podmanTest.Podman([]string{"pod", "create", "--share", "ipc"}) session := podmanTest.Podman([]string{"pod", "create", "--share", "ipc"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -380,7 +380,7 @@ var _ = Describe("Podman pod create", func() {
}) })
It("podman run --add-host in pod", func() { It("podman run --add-host in pod", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
session := podmanTest.Podman([]string{"pod", "create"}) session := podmanTest.Podman([]string{"pod", "create"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))

2
test/e2e/pod_pod_namespaces.go
View File

@ -61,7 +61,7 @@ var _ = Describe("Podman pod create", func() {
}) })
It("podman pod container dontshare PIDNS", func() { It("podman pod container dontshare PIDNS", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
session := podmanTest.Podman([]string{"pod", "create"}) session := podmanTest.Podman([]string{"pod", "create"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))

2
test/e2e/pod_ps_test.go
View File

@ -83,7 +83,7 @@ var _ = Describe("Podman ps", func() {
}) })
It("podman pod ps latest", func() { It("podman pod ps latest", func() {
SkipIfRemote() // Testing --latest flag SkipIfRemote("--latest flag n/a")
_, ec, podid1 := podmanTest.CreatePod("") _, ec, podid1 := podmanTest.CreatePod("")
Expect(ec).To(Equal(0)) Expect(ec).To(Equal(0))

6
test/e2e/prune_test.go
View File

@ -88,7 +88,7 @@ var _ = Describe("Podman prune", func() {
}) })
It("podman image prune skip cache images", func() { It("podman image prune skip cache images", func() {
SkipIfRemote() // FIXME should work on podman --remote SkipIfRemote("FIXME should work on podman --remote")
podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true")
none := podmanTest.Podman([]string{"images", "-a"}) none := podmanTest.Podman([]string{"images", "-a"})
@ -110,7 +110,7 @@ var _ = Describe("Podman prune", func() {
}) })
It("podman image prune dangling images", func() { It("podman image prune dangling images", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true")
podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true")
@ -147,7 +147,7 @@ var _ = Describe("Podman prune", func() {
}) })
It("podman system image prune unused images", func() { It("podman system image prune unused images", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
podmanTest.RestoreAllArtifacts() podmanTest.RestoreAllArtifacts()
podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true") podmanTest.BuildImage(pruneImage, "alpine_bash:latest", "true")
prune := podmanTest.PodmanNoCache([]string{"system", "prune", "-a", "--force"}) prune := podmanTest.PodmanNoCache([]string{"system", "prune", "-a", "--force"})

2
test/e2e/ps_test.go
View File

@ -101,7 +101,7 @@ var _ = Describe("Podman ps", func() {
}) })
It("podman ps latest flag", func() { It("podman ps latest flag", func() {
SkipIfRemote() // --latest is not supported on podman-remote SkipIfRemote("--latest is not supported on podman-remote")
_, ec, _ := podmanTest.RunLsContainer("") _, ec, _ := podmanTest.RunLsContainer("")
Expect(ec).To(Equal(0)) Expect(ec).To(Equal(0))
_, ec, _ = podmanTest.RunLsContainer("") _, ec, _ = podmanTest.RunLsContainer("")

8
test/e2e/pull_test.go
View File

@ -235,7 +235,7 @@ var _ = Describe("Podman pull", func() {
}) })
It("podman pull from docker-archive", func() { It("podman pull from docker-archive", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
podmanTest.RestoreArtifact(ALPINE) podmanTest.RestoreArtifact(ALPINE)
tarfn := filepath.Join(podmanTest.TempDir, "alp.tar") tarfn := filepath.Join(podmanTest.TempDir, "alp.tar")
session := podmanTest.PodmanNoCache([]string{"save", "-o", tarfn, "alpine"}) session := podmanTest.PodmanNoCache([]string{"save", "-o", tarfn, "alpine"})
@ -297,7 +297,7 @@ var _ = Describe("Podman pull", func() {
}) })
It("podman pull from oci-archive", func() { It("podman pull from oci-archive", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
podmanTest.RestoreArtifact(ALPINE) podmanTest.RestoreArtifact(ALPINE)
tarfn := filepath.Join(podmanTest.TempDir, "oci-alp.tar") tarfn := filepath.Join(podmanTest.TempDir, "oci-alp.tar")
session := podmanTest.PodmanNoCache([]string{"save", "--format", "oci-archive", "-o", tarfn, "alpine"}) session := podmanTest.PodmanNoCache([]string{"save", "--format", "oci-archive", "-o", tarfn, "alpine"})
@ -316,7 +316,7 @@ var _ = Describe("Podman pull", func() {
}) })
It("podman pull from local directory", func() { It("podman pull from local directory", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
podmanTest.RestoreArtifact(ALPINE) podmanTest.RestoreArtifact(ALPINE)
dirpath := filepath.Join(podmanTest.TempDir, "alpine") dirpath := filepath.Join(podmanTest.TempDir, "alpine")
os.MkdirAll(dirpath, os.ModePerm) os.MkdirAll(dirpath, os.ModePerm)
@ -341,7 +341,7 @@ var _ = Describe("Podman pull", func() {
}) })
It("podman pull from local OCI directory", func() { It("podman pull from local OCI directory", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
podmanTest.RestoreArtifact(ALPINE) podmanTest.RestoreArtifact(ALPINE)
dirpath := filepath.Join(podmanTest.TempDir, "alpine") dirpath := filepath.Join(podmanTest.TempDir, "alpine")
os.MkdirAll(dirpath, os.ModePerm) os.MkdirAll(dirpath, os.ModePerm)

2
test/e2e/rm_test.go
View File

@ -196,7 +196,7 @@ var _ = Describe("Podman rm", func() {
}) })
It("podman rm invalid --latest and --cidfile and --all", func() { It("podman rm invalid --latest and --cidfile and --all", func() {
SkipIfRemote() // Verifying --latest flag SkipIfRemote("Verifying --latest flag")
result := podmanTest.Podman([]string{"rm", "--cidfile", "foobar", "--latest"}) result := podmanTest.Podman([]string{"rm", "--cidfile", "foobar", "--latest"})
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()

4
test/e2e/rmi_test.go
View File

@ -185,7 +185,7 @@ var _ = Describe("Podman rmi", func() {
}) })
It("podman rmi with cached images", func() { It("podman rmi with cached images", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
session := podmanTest.PodmanNoCache([]string{"rmi", "-fa"}) session := podmanTest.PodmanNoCache([]string{"rmi", "-fa"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
@ -255,7 +255,7 @@ var _ = Describe("Podman rmi", func() {
}) })
It("podman rmi -a with parent|child images", func() { It("podman rmi -a with parent|child images", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
dockerfile := `FROM docker.io/library/alpine:latest AS base dockerfile := `FROM docker.io/library/alpine:latest AS base
RUN touch /1 RUN touch /1
ENV LOCAL=/1 ENV LOCAL=/1

2
test/e2e/run_cleanup_test.go
View File

@ -33,7 +33,7 @@ var _ = Describe("Podman run exit", func() {
}) })
It("podman run -d mount cleanup test", func() { It("podman run -d mount cleanup test", func() {
SkipIfRemote() // podman-remote does not support mount SkipIfRemote("podman-remote does not support mount")
SkipIfRootless() SkipIfRootless()
result := podmanTest.Podman([]string{"run", "-dt", ALPINE, "top"}) result := podmanTest.Podman([]string{"run", "-dt", ALPINE, "top"})

2
test/e2e/run_entrypoint_test.go
View File

@ -90,7 +90,7 @@ ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]
}) })
It("podman run user entrypoint overrides image entrypoint and image cmd", func() { It("podman run user entrypoint overrides image entrypoint and image cmd", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
dockerfile := `FROM docker.io/library/alpine:latest dockerfile := `FROM docker.io/library/alpine:latest
CMD ["-i"] CMD ["-i"]
ENTRYPOINT ["grep", "Alpine", "/etc/os-release"] ENTRYPOINT ["grep", "Alpine", "/etc/os-release"]

4
test/e2e/run_env_test.go
View File

@ -90,7 +90,7 @@ var _ = Describe("Podman run", func() {
}) })
It("podman run --env-host environment test", func() { It("podman run --env-host environment test", func() {
SkipIfRemote() // FIXME, We should check that --env-host reports correct error on podman-remote SkipIfRemote("FIXME, We should check that --env-host reports correct error on podman-remote")
env := append(os.Environ(), "FOO=BAR") env := append(os.Environ(), "FOO=BAR")
session := podmanTest.PodmanAsUser([]string{"run", "--rm", "--env-host", ALPINE, "/bin/printenv", "FOO"}, 0, 0, "", env) session := podmanTest.PodmanAsUser([]string{"run", "--rm", "--env-host", ALPINE, "/bin/printenv", "FOO"}, 0, 0, "", env)
@ -108,7 +108,7 @@ var _ = Describe("Podman run", func() {
}) })
It("podman run --http-proxy test", func() { It("podman run --http-proxy test", func() {
SkipIfRemote() // FIXME: Should report proper error when http-proxy is not supported SkipIfRemote("FIXME: Should report proper error when http-proxy is not supported")
os.Setenv("http_proxy", "1.2.3.4") os.Setenv("http_proxy", "1.2.3.4")
session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "http_proxy"}) session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "http_proxy"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()

2
test/e2e/run_restart_test.go
View File

@ -33,7 +33,7 @@ var _ = Describe("Podman run restart containers", func() {
}) })
It("Podman start after successful run", func() { It("Podman start after successful run", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
session := podmanTest.Podman([]string{"run", "--name", "test", ALPINE, "ls"}) session := podmanTest.Podman([]string{"run", "--name", "test", ALPINE, "ls"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))

2
test/e2e/run_security_labels.go
View File

@ -127,7 +127,7 @@ var _ = Describe("Podman generate kube", func() {
}) })
It("podman container runlabel (podman --version)", func() { It("podman container runlabel (podman --version)", func() {
SkipIfRemote() // runlabel not supported on podman-remote SkipIfRemote("runlabel not supported on podman-remote")
PodmanDockerfile := ` PodmanDockerfile := `
FROM alpine:latest FROM alpine:latest
LABEL io.containers.capabilities=chown,mknod` LABEL io.containers.capabilities=chown,mknod`

14
test/e2e/run_test.go
View File

@ -59,7 +59,7 @@ var _ = Describe("Podman run", func() {
}) })
It("podman run --signature-policy", func() { It("podman run --signature-policy", func() {
SkipIfRemote() // SigPolicy not handled by remote SkipIfRemote("SigPolicy not handled by remote")
session := podmanTest.Podman([]string{"run", "--pull=always", "--signature-policy", "/no/such/file", ALPINE}) session := podmanTest.Podman([]string{"run", "--pull=always", "--signature-policy", "/no/such/file", ALPINE})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Not(Equal(0))) Expect(session.ExitCode()).To(Not(Equal(0)))
@ -295,7 +295,7 @@ var _ = Describe("Podman run", func() {
}) })
It("podman run user capabilities test with image", func() { It("podman run user capabilities test with image", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
dockerfile := `FROM busybox dockerfile := `FROM busybox
USER bin` USER bin`
podmanTest.BuildImage(dockerfile, "test", "false") podmanTest.BuildImage(dockerfile, "test", "false")
@ -343,7 +343,7 @@ USER bin`
}) })
It("podman run limits host test", func() { It("podman run limits host test", func() {
SkipIfRemote() // This can only be used for local tests SkipIfRemote("This can only be used for local tests")
var l syscall.Rlimit var l syscall.Rlimit
@ -486,7 +486,7 @@ USER bin`
}) })
It("podman run notify_socket", func() { It("podman run notify_socket", func() {
SkipIfRemote() // This can only be used for local tests SkipIfRemote("This can only be used for local tests")
host := GetHostDistributionInfo() host := GetHostDistributionInfo()
if host.Distribution != "rhel" && host.Distribution != "centos" && host.Distribution != "fedora" { if host.Distribution != "rhel" && host.Distribution != "centos" && host.Distribution != "fedora" {
@ -546,7 +546,7 @@ USER bin`
}) })
It("podman run with secrets", func() { It("podman run with secrets", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
containersDir := filepath.Join(podmanTest.TempDir, "containers") containersDir := filepath.Join(podmanTest.TempDir, "containers")
err := os.MkdirAll(containersDir, 0755) err := os.MkdirAll(containersDir, 0755)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
@ -711,7 +711,7 @@ USER bin`
}) })
It("podman run with built-in volume image", func() { It("podman run with built-in volume image", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
session := podmanTest.Podman([]string{"run", "--rm", redis, "ls"}) session := podmanTest.Podman([]string{"run", "--rm", redis, "ls"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -1028,7 +1028,7 @@ USER mail`
}) })
It("podman run with restart-policy always restarts containers", func() { It("podman run with restart-policy always restarts containers", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
testDir := filepath.Join(podmanTest.RunRoot, "restart-test") testDir := filepath.Join(podmanTest.RunRoot, "restart-test")
err := os.MkdirAll(testDir, 0755) err := os.MkdirAll(testDir, 0755)
Expect(err).To(BeNil()) Expect(err).To(BeNil())

6
test/e2e/run_volume_test.go
View File

@ -197,7 +197,7 @@ var _ = Describe("Podman run with volumes", func() {
}) })
It("podman run with volumes and suid/dev/exec options", func() { It("podman run with volumes and suid/dev/exec options", func() {
SkipIfRemote() // podman-remote does not support --volumes SkipIfRemote("podman-remote does not support --volumes")
mountPath := filepath.Join(podmanTest.TempDir, "secrets") mountPath := filepath.Join(podmanTest.TempDir, "secrets")
os.Mkdir(mountPath, 0755) os.Mkdir(mountPath, 0755)
@ -227,7 +227,7 @@ var _ = Describe("Podman run with volumes", func() {
}) })
It("podman run with tmpfs named volume mounts and unmounts", func() { It("podman run with tmpfs named volume mounts and unmounts", func() {
SkipIfRemote() // podman-remote does not support --volumes this test could be simplified to be tested on Remote. SkipIfRemote("podman-remote does not support --volumes this test could be simplified to be tested on Remote.")
SkipIfRootless() SkipIfRootless()
volName := "testvol" volName := "testvol"
mkVolume := podmanTest.Podman([]string{"volume", "create", "--opt", "type=tmpfs", "--opt", "device=tmpfs", "--opt", "o=nodev", "testvol"}) mkVolume := podmanTest.Podman([]string{"volume", "create", "--opt", "type=tmpfs", "--opt", "device=tmpfs", "--opt", "o=nodev", "testvol"})
@ -453,7 +453,7 @@ VOLUME /test/`
}) })
It("podman run with overlay volume flag", func() { It("podman run with overlay volume flag", func() {
SkipIfRemote() // Overlay volumes only work locally SkipIfRemote("Overlay volumes only work locally")
if os.Getenv("container") != "" { if os.Getenv("container") != "" {
Skip("Overlay mounts not supported when running in a container") Skip("Overlay mounts not supported when running in a container")
} }

2
test/e2e/run_working_dir.go
View File

@ -50,7 +50,7 @@ var _ = Describe("Podman run", func() {
}) })
It("podman run a container on an image with a workdir", func() { It("podman run a container on an image with a workdir", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
dockerfile := `FROM alpine dockerfile := `FROM alpine
RUN mkdir -p /home/foobar RUN mkdir -p /home/foobar
WORKDIR /etc/foobar` WORKDIR /etc/foobar`

2
test/e2e/runlabel_test.go
View File

@ -29,7 +29,7 @@ var _ = Describe("podman container runlabel", func() {
) )
BeforeEach(func() { BeforeEach(func() {
SkipIfRemote() // runlabel is not supported for remote connections SkipIfRemote("runlabel is not supported for remote connections")
tempdir, err = CreateTempDirInTempDir() tempdir, err = CreateTempDirInTempDir()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)

8
test/e2e/search_test.go
View File

@ -237,7 +237,7 @@ registries = ['{{.Host}}:{{.Port}}']`
}) })
It("podman search attempts HTTP if registry is in registries.insecure and force secure is false", func() { It("podman search attempts HTTP if registry is in registries.insecure and force secure is false", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
if podmanTest.Host.Arch == "ppc64le" { if podmanTest.Host.Arch == "ppc64le" {
Skip("No registry image for ppc64le") Skip("No registry image for ppc64le")
} }
@ -278,7 +278,7 @@ registries = ['{{.Host}}:{{.Port}}']`
}) })
It("podman search doesn't attempt HTTP if force secure is true", func() { It("podman search doesn't attempt HTTP if force secure is true", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
if podmanTest.Host.Arch == "ppc64le" { if podmanTest.Host.Arch == "ppc64le" {
Skip("No registry image for ppc64le") Skip("No registry image for ppc64le")
} }
@ -317,7 +317,7 @@ registries = ['{{.Host}}:{{.Port}}']`
}) })
It("podman search doesn't attempt HTTP if registry is not listed as insecure", func() { It("podman search doesn't attempt HTTP if registry is not listed as insecure", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
if podmanTest.Host.Arch == "ppc64le" { if podmanTest.Host.Arch == "ppc64le" {
Skip("No registry image for ppc64le") Skip("No registry image for ppc64le")
} }
@ -356,7 +356,7 @@ registries = ['{{.Host}}:{{.Port}}']`
}) })
It("podman search doesn't attempt HTTP if one registry is not listed as insecure", func() { It("podman search doesn't attempt HTTP if one registry is not listed as insecure", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
if podmanTest.Host.Arch == "ppc64le" { if podmanTest.Host.Arch == "ppc64le" {
Skip("No registry image for ppc64le") Skip("No registry image for ppc64le")
} }

4
test/e2e/stop_test.go
View File

@ -182,7 +182,7 @@ var _ = Describe("Podman stop", func() {
}) })
It("podman stop latest containers", func() { It("podman stop latest containers", func() {
SkipIfRemote() // Testing --latest SkipIfRemote("--latest flag n/a")
session := podmanTest.RunTopContainer("test1") session := podmanTest.RunTopContainer("test1")
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -289,7 +289,7 @@ var _ = Describe("Podman stop", func() {
}) })
It("podman stop invalid --latest and --cidfile and --all", func() { It("podman stop invalid --latest and --cidfile and --all", func() {
SkipIfRemote() // testing --latest SkipIfRemote("--latest flag n/a")
result := podmanTest.Podman([]string{"stop", "--cidfile", "foobar", "--latest"}) result := podmanTest.Podman([]string{"stop", "--cidfile", "foobar", "--latest"})
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()

2
test/e2e/system_df_test.go
View File

@ -35,7 +35,7 @@ var _ = Describe("podman system df", func() {
}) })
It("podman system df", func() { It("podman system df", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
session := podmanTest.Podman([]string{"create", ALPINE}) session := podmanTest.Podman([]string{"create", ALPINE})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))

2
test/e2e/system_reset_test.go
View File

@ -34,7 +34,7 @@ var _ = Describe("podman system reset", func() {
}) })
It("podman system reset", func() { It("podman system reset", func() {
SkipIfRemote() // system reset not supported on podman --remote SkipIfRemote("system reset not supported on podman --remote")
// system reset will not remove additional store images, so need to grab length // system reset will not remove additional store images, so need to grab length
session := podmanTest.Podman([]string{"rmi", "--force", "--all"}) session := podmanTest.Podman([]string{"rmi", "--force", "--all"})

2
test/e2e/unshare_test.go
View File

@ -15,7 +15,7 @@ var _ = Describe("Podman unshare", func() {
podmanTest *PodmanTestIntegration podmanTest *PodmanTestIntegration
) )
BeforeEach(func() { BeforeEach(func() {
SkipIfRemote() // podman-remote unshare is not supported SkipIfRemote("podman-remote unshare is not supported")
if _, err := os.Stat("/proc/self/uid_map"); err != nil { if _, err := os.Stat("/proc/self/uid_map"); err != nil {
Skip("User namespaces not supported.") Skip("User namespaces not supported.")
} }

2
test/e2e/untag_test.go
View File

@ -33,7 +33,7 @@ var _ = Describe("Podman untag", func() {
}) })
It("podman untag all", func() { It("podman untag all", func() {
SkipIfRemote() // FIXME This should work on podman-remote SkipIfRemote("FIXME This should work on podman-remote")
setup := podmanTest.PodmanNoCache([]string{"pull", ALPINE}) setup := podmanTest.PodmanNoCache([]string{"pull", ALPINE})
setup.WaitWithDefaultTimeout() setup.WaitWithDefaultTimeout()
Expect(setup.ExitCode()).To(Equal(0)) Expect(setup.ExitCode()).To(Equal(0))