opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 16:33:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6312 from rhatdan/image

Browse Source 
Fix remote handling of podman images calls
This commit is contained in:
OpenShift Merge Robot
2020-05-21 17:13:36 +02:00
committed by GitHub
parent 58baeab330 9add1abd12
commit 363f8820bc
8 changed files with 78 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test/e2e/images_test.go
View File

@ -152,9 +152,7 @@ var _ = Describe("Podman images", func() {
})
It("podman images filter reference", func() {
if podmanTest.RemoteTest {
Skip("Does not work on remote client")
}
SkipIfRemote()
podmanTest.RestoreAllArtifacts()
result := podmanTest.PodmanNoCache([]string{"images", "-q", "-f", "reference=docker.io*"})
result.WaitWithDefaultTimeout()
@ -180,9 +178,7 @@ var _ = Describe("Podman images", func() {
})
It("podman images filter before image", func() {
if podmanTest.RemoteTest {
Skip("Does not work on remote client")
}
SkipIfRemote()
dockerfile := `FROM docker.io/library/alpine:latest
RUN apk update && apk add man
`
@ -194,9 +190,7 @@ RUN apk update && apk add man
})
It("podman images filter after image", func() {
if podmanTest.RemoteTest {
Skip("Does not work on remote client")
}
SkipIfRemote()
podmanTest.RestoreAllArtifacts()
rmi := podmanTest.PodmanNoCache([]string{"rmi", "busybox"})
rmi.WaitWithDefaultTimeout()
@ -212,9 +206,7 @@ RUN apk update && apk add man
})
It("podman image list filter after image", func() {
if podmanTest.RemoteTest {
Skip("Does not work on remote client")
}
SkipIfRemote()
podmanTest.RestoreAllArtifacts()
rmi := podmanTest.PodmanNoCache([]string{"image", "rm", "busybox"})
rmi.WaitWithDefaultTimeout()
@ -230,9 +222,7 @@ RUN apk update && apk add man
})
It("podman images filter dangling", func() {
if podmanTest.RemoteTest {
Skip("Does not work on remote client")
}
SkipIfRemote()
dockerfile := `FROM docker.io/library/alpine:latest
`
podmanTest.BuildImage(dockerfile, "foobar.com/before:latest", "false")
@ -308,9 +298,7 @@ RUN apk update && apk add man
})
It("podman images --all flag", func() {
if podmanTest.RemoteTest {
Skip("Does not work on remote client")
}
SkipIfRemote()
podmanTest.RestoreAllArtifacts()
dockerfile := `FROM docker.io/library/alpine:latest
RUN mkdir hello
@ -343,10 +331,7 @@ LABEL "com.example.vendor"="Example Vendor"
})
It("podman with images with no layers", func() {
if podmanTest.RemoteTest {
Skip("Does not work on remote client")
}
SkipIfRemote()
dockerfile := strings.Join([]string{
`FROM scratch`,
`LABEL org.opencontainers.image.authors="<somefolks@example.org>"`,