diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go index 26e07b5dd2..245ccf6497 100644 --- a/test/e2e/attach_test.go +++ b/test/e2e/attach_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman attach", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index f95a418965..8620d48efe 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman commit", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index b6bc9b70d4..cdcf1e8c67 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman create", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index 319f086cd7..a83bb14da7 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" "sort" @@ -26,6 +27,9 @@ var _ = Describe("Podman diff", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 510fc81aa5..74286494e8 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman exec", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go index 3acb447f29..c11fd777bf 100644 --- a/test/e2e/export_test.go +++ b/test/e2e/export_test.go @@ -1,8 +1,8 @@ package integration import ( + "fmt" "os" - "path/filepath" . "github.com/onsi/ginkgo" @@ -27,6 +27,9 @@ var _ = Describe("Podman export", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) diff --git a/test/e2e/history_test.go b/test/e2e/history_test.go index a317331ffa..d4b5ad5c0c 100644 --- a/test/e2e/history_test.go +++ b/test/e2e/history_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman history", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index c04ae91bd1..a8854d08de 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -28,6 +28,9 @@ var _ = Describe("Podman images", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman images", func() { diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go index 9ad6509487..80773cf8bf 100644 --- a/test/e2e/import_test.go +++ b/test/e2e/import_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" "path/filepath" @@ -26,6 +27,9 @@ var _ = Describe("Podman import", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman import with source and reference", func() { diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index 965dffaae9..dd8645223e 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -24,6 +25,9 @@ var _ = Describe("Podman Info", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman info json output", func() { diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index e04465eb5e..bff56189eb 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" "strings" @@ -26,7 +27,9 @@ var _ = Describe("Podman inspect", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman inspect alpine image", func() { diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go index 4b5cf72b63..fdf42f2b62 100644 --- a/test/e2e/kill_test.go +++ b/test/e2e/kill_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman kill", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index d39f759273..fa74c45b64 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" "path/filepath" @@ -26,6 +27,9 @@ var _ = Describe("Podman load", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman load input flag", func() { @@ -164,11 +168,9 @@ var _ = Describe("Podman load", func() { It("podman load localhost repo from scratch", func() { outfile := filepath.Join(podmanTest.TempDir, "load_test.tar.gz") - setup := podmanTest.Podman([]string{"pull", fedoraMinimal}) - setup.WaitWithDefaultTimeout() - Expect(setup.ExitCode()).To(Equal(0)) + podmanTest.RestoreArtifact(fedoraMinimal) - setup = podmanTest.Podman([]string{"tag", "fedora-minimal", "hello:world"}) + setup := podmanTest.Podman([]string{"tag", "fedora-minimal", "hello:world"}) setup.WaitWithDefaultTimeout() Expect(setup.ExitCode()).To(Equal(0)) @@ -192,11 +194,9 @@ var _ = Describe("Podman load", func() { It("podman load localhost repo from dir", func() { outfile := filepath.Join(podmanTest.TempDir, "load") - setup := podmanTest.Podman([]string{"pull", fedoraMinimal}) - setup.WaitWithDefaultTimeout() - Expect(setup.ExitCode()).To(Equal(0)) + podmanTest.RestoreArtifact(fedoraMinimal) - setup = podmanTest.Podman([]string{"tag", "fedora-minimal", "hello:world"}) + setup := podmanTest.Podman([]string{"tag", "fedora-minimal", "hello:world"}) setup.WaitWithDefaultTimeout() Expect(setup.ExitCode()).To(Equal(0)) diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 74e31016cb..ca39c338e2 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman logs", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) //sudo bin/podman run -it --rm fedora-minimal bash -c 'for a in `seq 5`; do echo hello; done' diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go index 1c206c5970..fbb0a3eb7d 100644 --- a/test/e2e/mount_test.go +++ b/test/e2e/mount_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman mount", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman mount", func() { diff --git a/test/e2e/namespace_test.go b/test/e2e/namespace_test.go index 7cc6dc1149..017edd231b 100644 --- a/test/e2e/namespace_test.go +++ b/test/e2e/namespace_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman namespaces", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman namespace test", func() { diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index a775689335..c34964f592 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -28,7 +29,9 @@ var _ = Describe("Podman pause", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman pause bogus container", func() { diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index fa420675f0..a81751c418 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ 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)) }) It("podman create pod", func() { diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go index 9abc83262b..427fb63b3a 100644 --- a/test/e2e/pod_kill_test.go +++ b/test/e2e/pod_kill_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman pod kill", 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)) }) It("podman pod kill bogus", func() { diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go index aa9638ed2d..6a5afe73b5 100644 --- a/test/e2e/pod_pause_test.go +++ b/test/e2e/pod_pause_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -27,7 +28,9 @@ var _ = Describe("Podman pod pause", 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)) }) It("podman pod pause bogus pod", func() { diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index 4ab13f119a..4e29959172 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -27,7 +27,9 @@ var _ = Describe("Podman ps", 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)) }) It("podman pod ps no pods", func() { diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go index 8de3a05b15..86132c04f9 100644 --- a/test/e2e/pod_restart_test.go +++ b/test/e2e/pod_restart_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman pod restart", 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)) }) It("podman pod restart bogus pod", func() { diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go index 4ebf2f3402..52e5e89898 100644 --- a/test/e2e/pod_rm_test.go +++ b/test/e2e/pod_rm_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman pod rm", 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)) }) It("podman pod rm empty pod", func() { diff --git a/test/e2e/pod_start_test.go b/test/e2e/pod_start_test.go index 682aedd724..17296c4b37 100644 --- a/test/e2e/pod_start_test.go +++ b/test/e2e/pod_start_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman pod start", 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)) }) It("podman pod start bogus pod", func() { diff --git a/test/e2e/pod_stop_test.go b/test/e2e/pod_stop_test.go index c954f584dd..0eb41b696e 100644 --- a/test/e2e/pod_stop_test.go +++ b/test/e2e/pod_stop_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman pod stop", 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)) }) It("podman pod stop bogus pod", func() { diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index 9632212535..aef5b8f390 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -1,12 +1,12 @@ package integration import ( - "os" - "fmt" + "os" + "strings" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "strings" ) var _ = Describe("Podman port", func() { @@ -27,7 +27,9 @@ var _ = Describe("Podman port", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman port all and latest", func() { diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index b3d58af772..7e4ec8e384 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -29,7 +29,9 @@ var _ = Describe("Podman ps", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman ps no containers", func() { @@ -232,7 +234,7 @@ var _ = Describe("Podman ps", func() { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - podmanTest.RestoreArtifact(nginx) + podmanTest.RestoreArtifact(fedoraMinimal) session = podmanTest.Podman([]string{"run", "-d", fedoraMinimal, "pwd"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index 36c0936cb0..8a28f236db 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -3,6 +3,7 @@ package integration import ( "os" + "fmt" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "strings" @@ -26,7 +27,9 @@ var _ = Describe("Podman pull", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman pull from docker with tag", func() { diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index 3f559cc958..ed07933f7a 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" "path/filepath" "strings" @@ -27,7 +28,9 @@ var _ = Describe("Podman push", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman push to containers/storage", func() { diff --git a/test/e2e/refresh_test.go b/test/e2e/refresh_test.go index da08f28fb0..76601354f5 100644 --- a/test/e2e/refresh_test.go +++ b/test/e2e/refresh_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" "time" @@ -22,11 +23,13 @@ var _ = Describe("Podman refresh", func() { } podmanTest = PodmanCreate(tmpdir) podmanTest.RestoreAllArtifacts() - podmanTest.RestoreArtifact(fedoraMinimal) }) AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) Specify("Refresh with no containers succeeds", func() { diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 812ba5ac98..d2fc354859 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" "time" @@ -26,6 +27,9 @@ var _ = Describe("Podman restart", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("Podman restart bogus container", func() { diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index 1404312d9f..cbc03a078b 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman rm", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman rm stopped container", func() { diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index 0fdfa67972..4e38f04f8a 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -27,6 +28,9 @@ var _ = Describe("Podman rmi", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) diff --git a/test/e2e/rootless_test.go b/test/e2e/rootless_test.go index 918faa3209..11da9ac9f3 100644 --- a/test/e2e/rootless_test.go +++ b/test/e2e/rootless_test.go @@ -29,6 +29,9 @@ var _ = Describe("Podman rootless", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman rootless rootfs", func() { diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index 55dda06ff3..efd7c8bb89 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -20,13 +21,14 @@ var _ = Describe("Podman run with --cgroup-parent", func() { os.Exit(1) } podmanTest = PodmanCreate(tempdir) - podmanTest.RestoreAllArtifacts() podmanTest.RestoreArtifact(fedoraMinimal) }) AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) Specify("valid --cgroup-parent using cgroupfs", func() { diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go index 8adf8888cf..68e0d2208b 100644 --- a/test/e2e/run_cleanup_test.go +++ b/test/e2e/run_cleanup_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman run exit", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman run -d mount cleanup test", func() { diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go index ca0fb5166c..d56dfac647 100644 --- a/test/e2e/run_cpu_test.go +++ b/test/e2e/run_cpu_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman run cpu", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman run cpu-period", func() { diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go index ab39d2cbdb..eb1b423dd5 100644 --- a/test/e2e/run_device_test.go +++ b/test/e2e/run_device_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman kill", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman run bad device test", func() { diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go index e2c0829f39..c5a02c7764 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -3,6 +3,7 @@ package integration import ( "os" + "fmt" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) @@ -25,7 +26,9 @@ var _ = Describe("Podman run dns", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman run add search domain", func() { diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index 7cae4e0df4..48ed0ce1a8 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman run entrypoint", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman run no command, entrypoint, or cmd", func() { diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go index b381d06138..bb38f72225 100644 --- a/test/e2e/run_exit_test.go +++ b/test/e2e/run_exit_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman run exit", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman run exit 125", func() { diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go index a7482a6ea3..cc2b969a96 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman run memory", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman run memory test", func() { diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index e1c1608b94..02f010b5c9 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman rmi", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman run network connection with default bridge", func() { diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index ccc534780b..56be68c48b 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -20,13 +21,14 @@ var _ = Describe("Podman run ns", func() { os.Exit(1) } podmanTest = PodmanCreate(tempdir) - podmanTest.RestoreAllArtifacts() podmanTest.RestoreArtifact(fedoraMinimal) }) AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman run pidns test", func() { diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go index 426b83d3c7..4f81c7c45e 100644 --- a/test/e2e/run_privileged_test.go +++ b/test/e2e/run_privileged_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" "strings" @@ -26,7 +27,9 @@ var _ = Describe("Podman privileged container tests", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman privileged make sure sys is mounted rw", func() { diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go index 84eb69b0c9..a2f0b8b41f 100644 --- a/test/e2e/run_restart_test.go +++ b/test/e2e/run_restart_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman run restart containers", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("Podman start after successful run", func() { diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index 9a9f5d1adf..bd00b8aa96 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -45,13 +45,14 @@ var _ = Describe("Podman run with --sig-proxy", func() { os.Exit(1) } podmanTest = PodmanCreate(tmpdir) - podmanTest.RestoreAllArtifacts() podmanTest.RestoreArtifact(fedoraMinimal) }) AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) Specify("signals are forwarded to container using sig-proxy", func() { diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 92aa2f191c..4c328662b8 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -31,6 +31,9 @@ var _ = Describe("Podman run", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman run a container based on local image", func() { diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index 57c11848a9..ae0785378b 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -3,6 +3,7 @@ package integration import ( "os" + "fmt" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) @@ -25,7 +26,9 @@ var _ = Describe("Podman UserNS support", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman uidmapping and gidmapping", func() { diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index 7009d5648a..586215c461 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" "path/filepath" @@ -26,6 +27,9 @@ var _ = Describe("Podman save", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman save output flag", func() { diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index d743c3484e..dec84b19a4 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "io/ioutil" "os" "path/filepath" @@ -47,7 +48,9 @@ var _ = Describe("Podman search", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman search", func() { diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index 6282d6c841..9218cda69d 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman start", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman start bogus container", func() { diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index bfcee1ba09..ad40cbe5a9 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman stats", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman stats should run with no containers", func() { diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index 4811f5973f..9698a31102 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,6 +26,9 @@ var _ = Describe("Podman stop", func() { AfterEach(func() { podmanTest.Cleanup() + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman stop bogus container", func() { diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go index b07bc55505..1b58fbd30d 100644 --- a/test/e2e/tag_test.go +++ b/test/e2e/tag_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman tag", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman tag shortname:latest", func() { diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go index d26a19ba4b..9537c2f507 100644 --- a/test/e2e/top_test.go +++ b/test/e2e/top_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman top", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman top without container name or id", func() { diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index c6b71bec13..4670c6e1ef 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -20,13 +21,13 @@ var _ = Describe("Podman version", func() { os.Exit(1) } podmanTest = PodmanCreate(tempdir) - podmanTest.RestoreAllArtifacts() - podmanTest.RestoreArtifact(fedoraMinimal) }) AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman version", func() { diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go index 5448b5ae47..08eb306583 100644 --- a/test/e2e/wait_test.go +++ b/test/e2e/wait_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/onsi/ginkgo" @@ -25,7 +26,9 @@ var _ = Describe("Podman wait", func() { AfterEach(func() { podmanTest.Cleanup() - + f := CurrentGinkgoTestDescription() + timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds()) + GinkgoWriter.Write([]byte(timedResult)) }) It("podman wait on bogus container", func() {