summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-07-30 12:15:01 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-07-30 23:53:08 +0000
commit5a4e5902a00fe593afc560e8ef9af1b246821f62 (patch)
treebb9429778c5e2db9a73cd1ca75fb90734176d43b
parent8694e5414c97506302e424b36759de70008190ae (diff)
downloadpodman-5a4e5902a00fe593afc560e8ef9af1b246821f62.tar.gz
podman-5a4e5902a00fe593afc560e8ef9af1b246821f62.tar.bz2
podman-5a4e5902a00fe593afc560e8ef9af1b246821f62.zip
Integration Test Improvements #2
This is the second round of performance improvements for out integration tests. Signed-off-by: baude <bbaude@redhat.com> Closes: #1190 Approved by: rhatdan
-rw-r--r--test/e2e/libpod_suite_test.go2
-rw-r--r--test/e2e/load_test.go3
-rw-r--r--test/e2e/pod_rm_test.go2
-rw-r--r--test/e2e/port_test.go6
-rw-r--r--test/e2e/ps_test.go7
-rw-r--r--test/e2e/pull_test.go8
-rw-r--r--test/e2e/run_networking_test.go2
7 files changed, 13 insertions, 17 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 7f65cce35..2be41ae26 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -35,7 +35,7 @@ var (
BB = "docker.io/library/busybox: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
)
diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go
index 8ea4440ba..a4910df0c 100644
--- a/test/e2e/load_test.go
+++ b/test/e2e/load_test.go
@@ -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))
diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go
index 52e5e8989..1ce0d18c7 100644
--- a/test/e2e/pod_rm_test.go
+++ b/test/e2e/pod_rm_test.go
@@ -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"})
diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go
index aef5b8f39..10698f376 100644
--- a/test/e2e/port_test.go
+++ b/test/e2e/port_test.go
@@ -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))
@@ -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))
@@ -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))
diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go
index 7e4ec8e38..1b8002166 100644
--- a/test/e2e/ps_test.go
+++ b/test/e2e/ps_test.go
@@ -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))
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
index 8a28f236d..821476f39 100644
--- a/test/e2e/pull_test.go
+++ b/test/e2e/pull_test.go
@@ -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))
})
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go
index 02f010b5c..f7a7f8d67 100644
--- a/test/e2e/run_networking_test.go
+++ b/test/e2e/run_networking_test.go
@@ -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"})