opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 13:38:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Integration Test Improvements #2

Browse Source 
This is the second round of performance improvements for out
integration tests.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #1190
Approved by: rhatdan
This commit is contained in:
baude
2018-07-30 12:15:01 -05:00
committed by Atomic Bot
parent 8694e5414c
commit 5a4e5902a0
7 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/libpod_suite_test.go
View File

@ -35,7 +35,7 @@ var (
BB = "docker.io/library/busybox:latest" BB = "docker.io/library/busybox:latest"
BB_GLIBC = "docker.io/library/busybox:glibc" BB_GLIBC = "docker.io/library/busybox:glibc"
fedoraMinimal = "registry.fedoraproject.org/fedora-minimal:latest" fedoraMinimal = "registry.fedoraproject.org/fedora-minimal:latest"
nginx = "docker.io/library/nginx:latest" nginx = "quay.io/baude/alpine_nginx:latest"
defaultWaitTimeout = 90 defaultWaitTimeout = 90
) )

3
test/e2e/load_test.go
View File

@ -168,9 +168,8 @@ var _ = Describe("Podman load", func() {
It("podman load localhost repo from scratch", func() { It("podman load localhost repo from scratch", func() {
outfile := filepath.Join(podmanTest.TempDir, "load_test.tar.gz") 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() setup.WaitWithDefaultTimeout()
Expect(setup.ExitCode()).To(Equal(0)) Expect(setup.ExitCode()).To(Equal(0))

2
test/e2e/pod_rm_test.go
View File

@ -152,7 +152,7 @@ var _ = Describe("Podman pod rm", func() {
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) 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() session.WaitWithDefaultTimeout()
result := podmanTest.Podman([]string{"pod", "rm", "-fa"}) result := podmanTest.Podman([]string{"pod", "rm", "-fa"})

6
test/e2e/port_test.go
View File

@ -46,7 +46,7 @@ var _ = Describe("Podman port", func() {
It("podman port -l nginx", func() { It("podman port -l nginx", func() {
podmanTest.RestoreArtifact(nginx) 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() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -60,7 +60,7 @@ var _ = Describe("Podman port", func() {
It("podman port -l port nginx", func() { It("podman port -l port nginx", func() {
podmanTest.RestoreArtifact(nginx) 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() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -73,7 +73,7 @@ var _ = Describe("Podman port", func() {
It("podman port -a nginx", func() { It("podman port -a nginx", func() {
podmanTest.RestoreArtifact(nginx) 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() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))

7
test/e2e/ps_test.go
View File

@ -192,14 +192,11 @@ var _ = Describe("Podman ps", func() {
}) })
It("podman --sort by size", func() { It("podman --sort by size", func() {
// these images chosen because their size would be sorted differently alphabetically vs session := podmanTest.Podman([]string{"create", "busybox", "ls"})
// by the size of their virtual fs
session := podmanTest.Podman([]string{"run", "docker.io/mattdm/fedora-small", "ls"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
podmanTest.RestoreArtifact(nginx) session = podmanTest.Podman([]string{"create", "-dt", ALPINE, "top"})
session = podmanTest.Podman([]string{"run", "-dt", "-P", "docker.io/library/nginx:latest"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))

8
test/e2e/pull_test.go
View File

@ -53,21 +53,21 @@ var _ = Describe("Podman pull", func() {
}) })
It("podman pull from alternate registry with tag", 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() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) 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() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
}) })
It("podman pull from alternate registry without tag", func() { 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() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) 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() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
}) })

2
test/e2e/run_networking_test.go
View File

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