diff options
author | baude <bbaude@redhat.com> | 2018-07-31 09:05:48 -0500 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-01 13:01:44 +0000 |
commit | a8ae7eae9c9e545b685abfd1e42a2a63cb547a80 (patch) | |
tree | d7d8077f1c38bfee990cb3ca061c53ff408023dd /test/e2e/push_test.go | |
parent | 1a439f9fcbbc6a2b509c1ca7e23207a07a652399 (diff) | |
download | podman-a8ae7eae9c9e545b685abfd1e42a2a63cb547a80.tar.gz podman-a8ae7eae9c9e545b685abfd1e42a2a63cb547a80.tar.bz2 podman-a8ae7eae9c9e545b685abfd1e42a2a63cb547a80.zip |
Integration Test Improvements #3
Third round of speed improvements to the integration tests.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #1193
Approved by: rhatdan
Diffstat (limited to 'test/e2e/push_test.go')
-rw-r--r-- | test/e2e/push_test.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index ed07933f7..3ee150551 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -58,7 +58,8 @@ var _ = Describe("Podman push", func() { }) It("podman push to local registry", func() { - session := podmanTest.Podman([]string{"run", "-d", "--name", "registry", "-p", "5000:5000", "docker.io/library/registry:2", "/entrypoint.sh", "/etc/docker/registry/config.yml"}) + podmanTest.RestoreArtifact(registry) + session := podmanTest.Podman([]string{"run", "-d", "--name", "registry", "-p", "5000:5000", registry, "/entrypoint.sh", "/etc/docker/registry/config.yml"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -91,8 +92,8 @@ var _ = Describe("Podman push", func() { defer podmanTest.SystemExec("setenforce", []string{"1"}) } } - - session := podmanTest.Podman([]string{"run", "--entrypoint", "htpasswd", "registry:2", "-Bbn", "podmantest", "test"}) + podmanTest.RestoreArtifact(registry) + session := podmanTest.Podman([]string{"run", "--entrypoint", "htpasswd", registry, "-Bbn", "podmantest", "test"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -108,7 +109,7 @@ var _ = Describe("Podman push", func() { strings.Join([]string{authPath, "/auth"}, ":"), "-e", "REGISTRY_AUTH=htpasswd", "-e", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm", "-e", "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "-v", strings.Join([]string{certPath, "/certs"}, ":"), "-e", "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", - "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", "registry:2"}) + "-e", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key", registry}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |