Skip to content

Integration Test Improvements #2 #1190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
baude wants to merge 1 commit into from
Closed

Integration Test Improvements #2 #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/e2e/libpod_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var (
ALPINE = "docker.io/library/alpine:latest"
BB_GLIBC = "docker.io/library/busybox:glibc"
fedoraMinimal = "registry.fedoraproject.org/fedora-minimal:latest"
nginx = "docker.io/library/nginx:latest"
nginx = "quay.io/baude/alpine_nginx:latest"
defaultWaitTimeout = 90
)

Expand Down
3 changes: 1 addition & 2 deletions test/e2e/load_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,8 @@ var _ = Describe("Podman load", func() {

It("podman load localhost repo from scratch", func() {
outfile := filepath.Join(podmanTest.TempDir, "load_test.tar.gz")
podmanTest.RestoreArtifact(fedoraMinimal)

setup := podmanTest.Podman([]string{"tag", "fedora-minimal", "hello:world"})
setup := podmanTest.Podman([]string{"tag", ALPINE, "hello:world"})
setup.WaitWithDefaultTimeout()
Expect(setup.ExitCode()).To(Equal(0))

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/pod_rm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ var _ = Describe("Podman pod rm", func() {
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

session = podmanTest.Podman([]string{"run", "-d", "--pod", podid2, nginx})
session = podmanTest.Podman([]string{"run", "-d", "--pod", podid2, ALPINE, "top"})
session.WaitWithDefaultTimeout()

result := podmanTest.Podman([]string{"pod", "rm", "-fa"})
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/port_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var _ = Describe("Podman port", func() {

It("podman port -l nginx", func() {
podmanTest.RestoreArtifact(nginx)
session := podmanTest.Podman([]string{"run", "-dt", "-P", "docker.io/library/nginx:latest"})
session := podmanTest.Podman([]string{"run", "-dt", "-P", nginx})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

Expand All @@ -60,7 +60,7 @@ var _ = Describe("Podman port", func() {

It("podman port -l port nginx", func() {
podmanTest.RestoreArtifact(nginx)
session := podmanTest.Podman([]string{"run", "-dt", "-P", "docker.io/library/nginx:latest"})
session := podmanTest.Podman([]string{"run", "-dt", "-P", nginx})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

Expand All @@ -73,7 +73,7 @@ var _ = Describe("Podman port", func() {

It("podman port -a nginx", func() {
podmanTest.RestoreArtifact(nginx)
session := podmanTest.Podman([]string{"run", "-dt", "-P", "docker.io/library/nginx:latest"})
session := podmanTest.Podman([]string{"run", "-dt", "-P", nginx})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

Expand Down
7 changes: 2 additions & 5 deletions test/e2e/ps_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,11 @@ var _ = Describe("Podman ps", func() {
})

It("podman --sort by size", func() {
// these images chosen because their size would be sorted differently alphabetically vs
// by the size of their virtual fs
session := podmanTest.Podman([]string{"run", "docker.io/mattdm/fedora-small", "ls"})
session := podmanTest.Podman([]string{"create", "busybox", "ls"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

podmanTest.RestoreArtifact(nginx)
session = podmanTest.Podman([]string{"run", "-dt", "-P", "docker.io/library/nginx:latest"})
session = podmanTest.Podman([]string{"create", "-dt", ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

Expand Down
8 changes: 4 additions & 4 deletions test/e2e/pull_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ var _ = Describe("Podman pull", func() {
})

It("podman pull from alternate registry with tag", func() {
session := podmanTest.Podman([]string{"pull", "registry.fedoraproject.org/fedora-minimal:latest"})
session := podmanTest.Podman([]string{"pull", nginx})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

session = podmanTest.Podman([]string{"rmi", "registry.fedoraproject.org/fedora-minimal:latest"})
session = podmanTest.Podman([]string{"rmi", nginx})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
})

It("podman pull from alternate registry without tag", func() {
session := podmanTest.Podman([]string{"pull", "registry.fedoraproject.org/fedora-minimal"})
session := podmanTest.Podman([]string{"pull", "quay.io/baude/alpine_nginx"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))

session = podmanTest.Podman([]string{"rmi", "registry.fedoraproject.org/fedora-minimal"})
session = podmanTest.Podman([]string{"rmi", "quay.io/baude/alpine_nginx"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
})
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/run_networking_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ var _ = Describe("Podman rmi", func() {

It("podman run network expose ports in image metadata", func() {
podmanTest.RestoreArtifact(nginx)
session := podmanTest.Podman([]string{"run", "-dt", "-P", nginx})
session := podmanTest.Podman([]string{"create", "-dt", "-P", nginx})
session.Wait(90)
Expect(session.ExitCode()).To(Equal(0))
results := podmanTest.Podman([]string{"inspect", "-l"})
Expand Down