summaryrefslogtreecommitdiff
path: root/test/e2e/pod_infra_container_test.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-08 12:27:20 -0800
committerGitHub <noreply@github.com>2019-03-08 12:27:20 -0800
commit008aaf7468bf6987a5b6c0b9eb63cf9a2972f7d1 (patch)
treeb3c6fe100edd84e9a199c016498b871bfe94bff7 /test/e2e/pod_infra_container_test.go
parentbe6ad02049780027d0c2e1506d9c6bb56d8abd26 (diff)
parentd5546008ab00d2a192eff4ad93e53e1f24e93e4c (diff)
downloadpodman-008aaf7468bf6987a5b6c0b9eb63cf9a2972f7d1.tar.gz
podman-008aaf7468bf6987a5b6c0b9eb63cf9a2972f7d1.tar.bz2
podman-008aaf7468bf6987a5b6c0b9eb63cf9a2972f7d1.zip
Merge pull request #2560 from baude/ginkgoimprovements
ginkgo status improvements
Diffstat (limited to 'test/e2e/pod_infra_container_test.go')
-rw-r--r--test/e2e/pod_infra_container_test.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go
index d9e5d380a..99197dc39 100644
--- a/test/e2e/pod_infra_container_test.go
+++ b/test/e2e/pod_infra_container_test.go
@@ -3,7 +3,6 @@
package integration
import (
- "fmt"
"os"
"strconv"
@@ -25,6 +24,7 @@ var _ = Describe("Podman pod create", func() {
os.Exit(1)
}
podmanTest = PodmanTestCreate(tempdir)
+ podmanTest.Setup()
podmanTest.RestoreAllArtifacts()
podmanTest.RestoreArtifact(infra)
})
@@ -32,8 +32,8 @@ var _ = Describe("Podman pod create", func() {
AfterEach(func() {
podmanTest.CleanupPod()
f := CurrentGinkgoTestDescription()
- timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds())
- GinkgoWriter.Write([]byte(timedResult))
+ processTestResult(f)
+
})
It("podman create infra container", func() {
@@ -209,8 +209,7 @@ var _ = Describe("Podman pod create", func() {
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- podmanTest.RestoreArtifact(fedoraMinimal)
- session = podmanTest.Podman([]string{"run", "--pod", podID, "--network", "bridge", fedoraMinimal, "curl", "localhost"})
+ session = podmanTest.Podman([]string{"run", "--pod", podID, "--network", "bridge", nginx, "curl", "localhost"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Not(Equal(0)))
})