Show duration for each ginkgo test and test speed improvements

Because our tests are getting so long, we want to be able to audit which tests are taking
the longest to complete.  This may indicate a bad test, bad CI, bad code, etc and therefore
should be auditable.

Also, make speed improvements to tests by making sure we only unpack caches images that
actually get used.

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

Closes: #1178
Approved by: mheon

58 files changed, 232 insertions, 49 deletions

diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go
index 26e07b5dd..245ccf649 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 f95a41896..8620d48ef 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 b6bc9b70d..cdcf1e8c6 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 319f086cd..a83bb14da 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 510fc81aa..74286494e 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 3acb447f2..c11fd777b 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 a317331ff..d4b5ad5c0 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 c04ae91bd..a8854d08d 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 9ad650948..80773cf8b 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 965dffaae..dd8645223 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 e04465eb5..bff56189e 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 4b5cf72b6..fdf42f2b6 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 d39f75927..fa74c45b6 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 74e31016c..ca39c338e 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 1c206c597..fbb0a3eb7 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 7cc6dc114..017edd231 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 a77568933..c34964f59 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 fa420675f..a81751c41 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 9abc83262..427fb63b3 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 aa9638ed2..6a5afe73b 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 4ab13f119..4e2995917 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 8de3a05b1..86132c04f 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 4ebf2f340..52e5e8989 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 682aedd72..17296c4b3 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 c954f584d..0eb41b696 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 963221253..aef5b8f39 100644
--- a/test/e2e/port_test.go
+++ b/test/e2e/port_test.go
@@ -1,12 +1,12 @@
 package integration
 
 import (
+	"fmt"
 	"os"
+	"strings"
 
-	"fmt"
 	. "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 b3d58af77..7e4ec8e38 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 36c0936cb..8a28f236d 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 3f559cc95..ed07933f7 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 da08f28fb..76601354f 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 812ba5ac9..d2fc35485 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 1404312d9..cbc03a078 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 0fdfa6797..4e38f04f8 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 918faa320..11da9ac9f 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 55dda06ff..efd7c8bb8 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 8adf8888c..68e0d2208 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 ca0fb5166..d56dfac64 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 ab39d2cbd..eb1b423dd 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 e2c0829f3..c5a02c776 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 7cae4e0df..48ed0ce1a 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 b381d0613..bb38f7222 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 a7482a6ea..cc2b969a9 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 e1c1608b9..02f010b5c 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 ccc534780..56be68c48 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 426b83d3c..4f81c7c45 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 84eb69b0c..a2f0b8b41 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 9a9f5d1ad..bd00b8aa9 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 92aa2f191..4c328662b 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 57c11848a..ae0785378 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 7009d5648..586215c46 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 d743c3484..dec84b19a 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 6282d6c84..9218cda69 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 bfcee1ba0..ad40cbe5a 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 4811f5973..9698a3110 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 b07bc5550..1b58fbd30 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 d26a19ba4..9537c2f50 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 c6b71bec1..4670c6e1e 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 5448b5ae4..08eb30658 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() {