diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go index 8b7394d337..3e2bbcb4dd 100644 --- a/pkg/bindings/test/images_test.go +++ b/pkg/bindings/test/images_test.go @@ -47,7 +47,7 @@ var _ = Describe("Podman images", func() { AfterEach(func() { // podmanTest.Cleanup() - // f := CurrentGinkgoTestDescription() + // f := CurrentSpecReport() // processTestResult(f) s.Kill() bt.cleanup() diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go index 95613af726..352c4f76b9 100644 --- a/test/e2e/attach_test.go +++ b/test/e2e/attach_test.go @@ -26,7 +26,7 @@ var _ = Describe("Podman attach", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 82046828a9..9572237f86 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -34,7 +34,7 @@ var _ = Describe("Podman build", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/checkpoint_image_test.go b/test/e2e/checkpoint_image_test.go index 0355acc113..5aad664b46 100644 --- a/test/e2e/checkpoint_image_test.go +++ b/test/e2e/checkpoint_image_test.go @@ -46,7 +46,7 @@ var _ = Describe("Podman checkpoint", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 8eacee321e..dfeb52bddc 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -66,7 +66,7 @@ var _ = Describe("Podman checkpoint", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/cleanup_test.go b/test/e2e/cleanup_test.go index 6dede52594..46e88804a8 100644 --- a/test/e2e/cleanup_test.go +++ b/test/e2e/cleanup_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman container cleanup", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index 4dd1041d9f..916dd0c239 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman commit", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 88ab829ad9..4e2d2fe2e4 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -408,8 +408,8 @@ func (p *PodmanTestIntegration) InspectContainer(name string) []define.InspectCo return session.InspectContainerToJSON() } -func processTestResult(f GinkgoTestDescription) { - tr := testResult{length: f.Duration.Seconds(), name: f.TestText} +func processTestResult(r SpecReport) { + tr := testResult{length: r.RunTime.Seconds(), name: r.LeafNodeText} testResultsMutex.Lock() testResults = append(testResults, tr) testResultsMutex.Unlock() diff --git a/test/e2e/container_clone_test.go b/test/e2e/container_clone_test.go index b3d93c3e0d..6757db1d6f 100644 --- a/test/e2e/container_clone_test.go +++ b/test/e2e/container_clone_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman container clone", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/container_create_volume_test.go b/test/e2e/container_create_volume_test.go index 19418239ee..40eca72b46 100644 --- a/test/e2e/container_create_volume_test.go +++ b/test/e2e/container_create_volume_test.go @@ -86,7 +86,7 @@ var _ = Describe("Podman create data volume", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) os.Unsetenv("CONTAINERS_CONF") }) diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go index dddb191805..2af006cc02 100644 --- a/test/e2e/container_inspect_test.go +++ b/test/e2e/container_inspect_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman container inspect", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index 41968a0817..e987fc8590 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -38,7 +38,7 @@ var _ = Describe("Verify podman containers.conf usage", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) os.Unsetenv("CONTAINERS_CONF") os.Unsetenv("CONTAINERS_CONF_OVERRIDE") diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go index f63a68f648..b4a18cfedc 100644 --- a/test/e2e/cp_test.go +++ b/test/e2e/cp_test.go @@ -34,7 +34,7 @@ var _ = Describe("Podman cp", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go index 48aad7e0bb..463e824c00 100644 --- a/test/e2e/create_staticip_test.go +++ b/test/e2e/create_staticip_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman create with --ip flag", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/create_staticmac_test.go b/test/e2e/create_staticmac_test.go index 7b94b82a05..22202d3d8e 100644 --- a/test/e2e/create_staticmac_test.go +++ b/test/e2e/create_staticmac_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman run with --mac-address flag", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index 3051af2272..3b8c2bed7f 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman create", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index 29384d767e..212d740c97 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman diff", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index e43bc9a190..8d16cc1de6 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -33,7 +33,7 @@ var _ = Describe("Podman events", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 99dde48dc9..9fe2050ea2 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman exec", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/exists_test.go b/test/e2e/exists_test.go index 2394ef1ba0..e1f327400a 100644 --- a/test/e2e/exists_test.go +++ b/test/e2e/exists_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman image|container exists", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go index 07825bb01f..d80828d77d 100644 --- a/test/e2e/export_test.go +++ b/test/e2e/export_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman export", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go index 9c4df01e8d..6ede21c410 100644 --- a/test/e2e/generate_kube_test.go +++ b/test/e2e/generate_kube_test.go @@ -36,7 +36,7 @@ var _ = Describe("Podman kube generate", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/generate_spec_test.go b/test/e2e/generate_spec_test.go index 58580af153..dc8cdc607a 100644 --- a/test/e2e/generate_spec_test.go +++ b/test/e2e/generate_spec_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman generate spec", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index d7d2d046fb..4a2fccf816 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman generate systemd", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go index 604a19a79d..0bfbe45717 100644 --- a/test/e2e/healthcheck_run_test.go +++ b/test/e2e/healthcheck_run_test.go @@ -31,9 +31,8 @@ var _ = Describe("Podman healthcheck 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)) + f := CurrentSpecReport() + processTestResult(f) }) diff --git a/test/e2e/history_test.go b/test/e2e/history_test.go index 133d46a5c6..000356bebf 100644 --- a/test/e2e/history_test.go +++ b/test/e2e/history_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman history", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go index 96f6a8687c..53cd0f2821 100644 --- a/test/e2e/image_scp_test.go +++ b/test/e2e/image_scp_test.go @@ -45,7 +45,7 @@ var _ = Describe("podman image scp", func() { } else { os.Unsetenv("CONTAINERS_CONF") } - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/image_sign_test.go b/test/e2e/image_sign_test.go index be4be63a3d..91e91981c5 100644 --- a/test/e2e/image_sign_test.go +++ b/test/e2e/image_sign_test.go @@ -39,7 +39,7 @@ var _ = Describe("Podman image sign", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) os.Setenv("GNUPGHOME", origGNUPGHOME) }) diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 5e5a393772..3b5e0692f0 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -31,7 +31,7 @@ var _ = Describe("Podman images", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go index 82ac6e89ff..f2366968d5 100644 --- a/test/e2e/import_test.go +++ b/test/e2e/import_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman import", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index 71f76a9e6d..f7e1febddb 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -31,7 +31,7 @@ var _ = Describe("Podman Info", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/init_test.go b/test/e2e/init_test.go index 54cd572a7d..27744c45cb 100644 --- a/test/e2e/init_test.go +++ b/test/e2e/init_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman init", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index 11a632ba18..6c07a52dd2 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman inspect", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go index 4c2c3c3cf5..8277da7e2b 100644 --- a/test/e2e/kill_test.go +++ b/test/e2e/kill_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman kill", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index bbce2368cf..a42a86cc58 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman load", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 6c77fca6a3..585019dc70 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -42,7 +42,7 @@ var _ = Describe("Podman logs", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index 723e9e15ac..5ef5417012 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -43,7 +43,7 @@ var _ = Describe("Podman manifest", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) It("create w/o image and attempt push w/o dest", func() { diff --git a/test/e2e/mount_rootless_test.go b/test/e2e/mount_rootless_test.go index bcdb9b4a0d..a5c678d42e 100644 --- a/test/e2e/mount_rootless_test.go +++ b/test/e2e/mount_rootless_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman mount", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go index 9e86124e34..35f1492254 100644 --- a/test/e2e/mount_test.go +++ b/test/e2e/mount_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman mount", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/negative_test.go b/test/e2e/negative_test.go index 0d3b8d49b1..c22309a4e4 100644 --- a/test/e2e/negative_test.go +++ b/test/e2e/negative_test.go @@ -25,7 +25,7 @@ var _ = Describe("Podman negative command-line", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go index e8e8adc6c4..340b8073ee 100644 --- a/test/e2e/network_connect_disconnect_test.go +++ b/test/e2e/network_connect_disconnect_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman network connect and disconnect", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index a0c1ba1f4c..dafc4bfcfd 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -36,7 +36,7 @@ var _ = Describe("Podman network create", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 7e88cd3394..49b72a865c 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -33,7 +33,7 @@ var _ = Describe("Podman network", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index 3754745cc8..b67a46e1c1 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -48,7 +48,7 @@ var _ = Describe("Podman pause", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/play_build_test.go b/test/e2e/play_build_test.go index a9683d2c8c..3be6a16756 100644 --- a/test/e2e/play_build_test.go +++ b/test/e2e/play_build_test.go @@ -33,7 +33,7 @@ var _ = Describe("Podman play kube with build", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 0050a007a6..26eecabc7c 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -1873,7 +1873,7 @@ var _ = Describe("Podman play kube", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_clone_test.go b/test/e2e/pod_clone_test.go index 4ba0036a0b..543224b560 100644 --- a/test/e2e/pod_clone_test.go +++ b/test/e2e/pod_clone_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman pod clone", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 5904e91090..3564f8d370 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -38,7 +38,7 @@ var _ = Describe("Podman pod create", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index 303a8dfda8..029d542c3a 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman pod create", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_initcontainers_test.go b/test/e2e/pod_initcontainers_test.go index 7e4f91358d..fb09631d22 100644 --- a/test/e2e/pod_initcontainers_test.go +++ b/test/e2e/pod_initcontainers_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman init containers", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go index 619f137cd3..e49c6a40d8 100644 --- a/test/e2e/pod_inspect_test.go +++ b/test/e2e/pod_inspect_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman pod inspect", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go index fa122e4015..e00e5b579a 100644 --- a/test/e2e/pod_kill_test.go +++ b/test/e2e/pod_kill_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman pod kill", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go index 81ab6041bc..34e297330a 100644 --- a/test/e2e/pod_pause_test.go +++ b/test/e2e/pod_pause_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman pod pause", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_pod_namespaces_test.go b/test/e2e/pod_pod_namespaces_test.go index 0c69fe8e85..9bc7d037db 100644 --- a/test/e2e/pod_pod_namespaces_test.go +++ b/test/e2e/pod_pod_namespaces_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman pod create", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go index d8b932d2f2..c4321d56f2 100644 --- a/test/e2e/pod_prune_test.go +++ b/test/e2e/pod_prune_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman pod prune", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index 33de07248c..7d52617941 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman ps", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go index f1368bdf64..8a93cfd168 100644 --- a/test/e2e/pod_restart_test.go +++ b/test/e2e/pod_restart_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman pod restart", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go index 2a4b09f8c6..e73074e0fc 100644 --- a/test/e2e/pod_rm_test.go +++ b/test/e2e/pod_rm_test.go @@ -32,7 +32,7 @@ var _ = Describe("Podman pod rm", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_start_test.go b/test/e2e/pod_start_test.go index 2f85862d0c..2bf73a491b 100644 --- a/test/e2e/pod_start_test.go +++ b/test/e2e/pod_start_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman pod start", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index c29777bda3..a5c944d08d 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -32,7 +32,7 @@ var _ = Describe("Podman pod stats", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_stop_test.go b/test/e2e/pod_stop_test.go index 9de7a70489..0af9c1abf2 100644 --- a/test/e2e/pod_stop_test.go +++ b/test/e2e/pod_stop_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman pod stop", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go index b7d4e023e9..e6b21fed0a 100644 --- a/test/e2e/pod_top_test.go +++ b/test/e2e/pod_top_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman top", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index 7b4db11778..ca859473d9 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman port", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 3814f33d2b..89b60493b4 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -40,7 +40,7 @@ var _ = Describe("Podman prune", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index 762779fd2a..5db6fcaffa 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -33,7 +33,7 @@ var _ = Describe("Podman ps", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index 0740677e37..ca4197aa20 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman pull", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index ba20f29637..ea4efa7a7a 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -33,7 +33,7 @@ var _ = Describe("Podman push", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go index ab1c318c7c..3038efcacd 100644 --- a/test/e2e/quadlet_test.go +++ b/test/e2e/quadlet_test.go @@ -421,7 +421,7 @@ var _ = Describe("quadlet system generator", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/rename_test.go b/test/e2e/rename_test.go index f3599cf0c6..81cb6fd618 100644 --- a/test/e2e/rename_test.go +++ b/test/e2e/rename_test.go @@ -28,7 +28,7 @@ var _ = Describe("podman rename", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 985e085e4a..096b70448a 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman restart", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index eb1195a453..35d22a860d 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman rm", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index 4b117392f1..d959da2614 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman rmi", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_aardvark_test.go b/test/e2e/run_aardvark_test.go index 867dc4e705..01e5efdc3a 100644 --- a/test/e2e/run_aardvark_test.go +++ b/test/e2e/run_aardvark_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman run networking", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go index 2ff840b657..27e06b74ef 100644 --- a/test/e2e/run_apparmor_test.go +++ b/test/e2e/run_apparmor_test.go @@ -45,7 +45,7 @@ var _ = Describe("Podman run", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index 821d63811a..b2ffee1648 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -33,7 +33,7 @@ var _ = Describe("Podman run with --cgroup-parent", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go index e7d64fc5dd..e5b3b74657 100644 --- a/test/e2e/run_cleanup_test.go +++ b/test/e2e/run_cleanup_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman run exit", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go index 5990907895..a34603211c 100644 --- a/test/e2e/run_cpu_test.go +++ b/test/e2e/run_cpu_test.go @@ -36,7 +36,7 @@ var _ = Describe("Podman run cpu", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go index eb407efea6..45e980dd10 100644 --- a/test/e2e/run_device_test.go +++ b/test/e2e/run_device_test.go @@ -43,7 +43,7 @@ var _ = Describe("Podman run device", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) os.Unsetenv("CONTAINERS_CONF") }) diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go index e3ead1ccab..326c26a1d4 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman run dns", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index 1dcbe49dee..69f623a317 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman run entrypoint", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go index 0ae9fdabe3..70f4a3746d 100644 --- a/test/e2e/run_env_test.go +++ b/test/e2e/run_env_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman run", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go index 4e56271486..27799820c9 100644 --- a/test/e2e/run_exit_test.go +++ b/test/e2e/run_exit_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman run exit", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go index b9e295c41e..92cbb027fe 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman run memory", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index ea0c00c105..bd411be2ab 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -37,7 +37,7 @@ var _ = Describe("Podman run networking", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index 855815a752..4431b3284e 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman run ns", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go index d3dcd649bd..f7de668eac 100644 --- a/test/e2e/run_passwd_test.go +++ b/test/e2e/run_passwd_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman run passwd", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go index 13388da2d7..85a04090ca 100644 --- a/test/e2e/run_privileged_test.go +++ b/test/e2e/run_privileged_test.go @@ -53,7 +53,7 @@ var _ = Describe("Podman privileged container tests", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go index ceb23ec403..c6abedb1cb 100644 --- a/test/e2e/run_restart_test.go +++ b/test/e2e/run_restart_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman run restart containers", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_seccomp_test.go b/test/e2e/run_seccomp_test.go index 8eeb72ad09..6d3dfdfe79 100644 --- a/test/e2e/run_seccomp_test.go +++ b/test/e2e/run_seccomp_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman run", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_security_labels_test.go b/test/e2e/run_security_labels_test.go index fe3e9b0d4f..a4ccb07048 100644 --- a/test/e2e/run_security_labels_test.go +++ b/test/e2e/run_security_labels_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman generate kube", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go index feda4d6cd4..33ccc87ecc 100644 --- a/test/e2e/run_selinux_test.go +++ b/test/e2e/run_selinux_test.go @@ -32,7 +32,7 @@ var _ = Describe("Podman run", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index 2206ba9f19..a9e076c112 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -37,7 +37,7 @@ var _ = Describe("Podman run with --sig-proxy", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go index 447ffcced2..b396357792 100644 --- a/test/e2e/run_staticip_test.go +++ b/test/e2e/run_staticip_test.go @@ -34,7 +34,7 @@ var _ = Describe("Podman run with --ip flag", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 1c1594dca9..d9da96d8e3 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -38,7 +38,7 @@ var _ = Describe("Podman run", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_transient_test.go b/test/e2e/run_transient_test.go index e857ff7b67..afb45f0723 100644 --- a/test/e2e/run_transient_test.go +++ b/test/e2e/run_transient_test.go @@ -38,7 +38,7 @@ var _ = Describe("Podman run with volumes", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index d9887b28a6..178a3db8e7 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -51,7 +51,7 @@ var _ = Describe("Podman UserNS support", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) os.Unsetenv("CONTAINERS_CONF") }) diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index 4f56761448..5b70896c16 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -36,7 +36,7 @@ var _ = Describe("Podman run with volumes", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) @@ -678,7 +678,7 @@ VOLUME /test/`, ALPINE) session = podmanTest.Podman([]string{"run", "--rm", "-v", ".:/app:O", ALPINE, "ls", "/app"}) session.WaitWithDefaultTimeout() - Expect(session.OutputToString()).To(ContainSubstring(filepath.Base(CurrentGinkgoTestDescription().FileName))) + Expect(session.OutputToString()).To(ContainSubstring(filepath.Base(CurrentSpecReport().FileName()))) Expect(session).Should(Exit(0)) // Make sure modifications in container do not show up on host diff --git a/test/e2e/run_working_dir_test.go b/test/e2e/run_working_dir_test.go index e8b66d9831..1e53ecae2e 100644 --- a/test/e2e/run_working_dir_test.go +++ b/test/e2e/run_working_dir_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman run", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index f6b95300a8..f372d3d858 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -41,7 +41,7 @@ var _ = Describe("podman container runlabel", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index a9dabddb7a..b6bb8e4017 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -31,7 +31,7 @@ var _ = Describe("Podman save", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index 5fe542943c..483239fdf0 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -67,7 +67,7 @@ registries = ['{{.Host}}:{{.Port}}']` AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/secret_test.go b/test/e2e/secret_test.go index cdcc10929c..6c91b9a641 100644 --- a/test/e2e/secret_test.go +++ b/test/e2e/secret_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman secret", func() { AfterEach(func() { podmanTest.CleanupSecrets() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index daf68aa7bc..42bd821c9a 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -30,7 +30,7 @@ var _ = Describe("Podman start", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index 5bab1a1a93..b57850d767 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -36,7 +36,7 @@ var _ = Describe("Podman stats", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index 088d5de431..d77682413f 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman stop", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/system_connection_test.go b/test/e2e/system_connection_test.go index f7cb566271..deb46110dd 100644 --- a/test/e2e/system_connection_test.go +++ b/test/e2e/system_connection_test.go @@ -45,7 +45,7 @@ var _ = Describe("podman system connection", func() { os.Unsetenv("CONTAINERS_CONF") } - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go index beed8a4f3d..b051bba32e 100644 --- a/test/e2e/system_df_test.go +++ b/test/e2e/system_df_test.go @@ -1,7 +1,6 @@ package integration import ( - "fmt" "os" "strconv" "strings" @@ -30,9 +29,8 @@ var _ = Describe("podman system df", 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)) + f := CurrentSpecReport() + processTestResult(f) }) It("podman system df", func() { diff --git a/test/e2e/system_dial_stdio_test.go b/test/e2e/system_dial_stdio_test.go index 862e435375..15c5e37366 100644 --- a/test/e2e/system_dial_stdio_test.go +++ b/test/e2e/system_dial_stdio_test.go @@ -1,7 +1,6 @@ package integration import ( - "fmt" "os" . "github.com/containers/podman/v4/test/utils" @@ -28,9 +27,8 @@ var _ = Describe("podman system dial-stdio", 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)) + f := CurrentSpecReport() + processTestResult(f) }) It("podman system dial-stdio help", func() { diff --git a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go index 8f0b41e7ae..91896b4a2e 100644 --- a/test/e2e/system_reset_test.go +++ b/test/e2e/system_reset_test.go @@ -1,7 +1,6 @@ package integration import ( - "fmt" "os" . "github.com/containers/podman/v4/test/utils" @@ -28,9 +27,8 @@ var _ = Describe("podman system reset", 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)) + f := CurrentSpecReport() + processTestResult(f) }) It("podman system reset", func() { diff --git a/test/e2e/system_service_test.go b/test/e2e/system_service_test.go index e46f94aed6..337da3c4a1 100644 --- a/test/e2e/system_service_test.go +++ b/test/e2e/system_service_test.go @@ -32,7 +32,8 @@ var _ = Describe("podman system service", func() { AfterEach(func() { podmanTest.Cleanup() - processTestResult(CurrentGinkgoTestDescription()) + f := CurrentSpecReport() + processTestResult(f) }) Describe("verify timeout", func() { diff --git a/test/e2e/systemd_activate_test.go b/test/e2e/systemd_activate_test.go index f4a57fce51..3b7624ee6e 100644 --- a/test/e2e/systemd_activate_test.go +++ b/test/e2e/systemd_activate_test.go @@ -54,7 +54,8 @@ var _ = Describe("Systemd activate", func() { AfterEach(func() { podmanTest.Cleanup() - processTestResult(CurrentGinkgoTestDescription()) + f := CurrentSpecReport() + processTestResult(f) }) It("stop podman.service", func() { diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index a733f1b923..73078af761 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -41,7 +41,7 @@ WantedBy=default.target AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go index e845c37141..596ae7433f 100644 --- a/test/e2e/tag_test.go +++ b/test/e2e/tag_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman tag", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/toolbox_test.go b/test/e2e/toolbox_test.go index c5a82a9414..808ed8bac2 100644 --- a/test/e2e/toolbox_test.go +++ b/test/e2e/toolbox_test.go @@ -59,7 +59,7 @@ var _ = Describe("Toolbox-specific testing", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go index 766390ee2c..287b545cf3 100644 --- a/test/e2e/top_test.go +++ b/test/e2e/top_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman top", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go index 71014c5d3b..4b220053ce 100644 --- a/test/e2e/tree_test.go +++ b/test/e2e/tree_test.go @@ -1,7 +1,6 @@ package integration import ( - "fmt" "os" . "github.com/containers/podman/v4/test/utils" @@ -29,9 +28,8 @@ var _ = Describe("Podman image tree", 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)) + f := CurrentSpecReport() + processTestResult(f) }) It("podman image tree", func() { diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go index e1123799a9..799359e2cf 100644 --- a/test/e2e/trust_test.go +++ b/test/e2e/trust_test.go @@ -31,7 +31,7 @@ var _ = Describe("Podman trust", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/unshare_test.go b/test/e2e/unshare_test.go index d2e21f5e1d..b6f43e25c5 100644 --- a/test/e2e/unshare_test.go +++ b/test/e2e/unshare_test.go @@ -36,7 +36,7 @@ var _ = Describe("Podman unshare", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go index 5f80f1380f..6279cc0780 100644 --- a/test/e2e/untag_test.go +++ b/test/e2e/untag_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman untag", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/update_test.go b/test/e2e/update_test.go index 67d093d609..acb25b0261 100644 --- a/test/e2e/update_test.go +++ b/test/e2e/update_test.go @@ -24,7 +24,7 @@ var _ = Describe("Podman update", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index 98cc8f4922..9b25efbf31 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman version", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/volume_create_test.go b/test/e2e/volume_create_test.go index da6948f9dd..db3ed3b169 100644 --- a/test/e2e/volume_create_test.go +++ b/test/e2e/volume_create_test.go @@ -29,7 +29,7 @@ var _ = Describe("Podman volume create", func() { AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/volume_exists_test.go b/test/e2e/volume_exists_test.go index 613cd50b47..eb200700c5 100644 --- a/test/e2e/volume_exists_test.go +++ b/test/e2e/volume_exists_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman volume exists", func() { AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go index 54b714bf0c..903133573f 100644 --- a/test/e2e/volume_inspect_test.go +++ b/test/e2e/volume_inspect_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman volume inspect", func() { AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/volume_ls_test.go b/test/e2e/volume_ls_test.go index d74537d000..2889af14aa 100644 --- a/test/e2e/volume_ls_test.go +++ b/test/e2e/volume_ls_test.go @@ -28,7 +28,7 @@ var _ = Describe("Podman volume ls", func() { AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/volume_plugin_test.go b/test/e2e/volume_plugin_test.go index 480eed8d82..5d6d6a7971 100644 --- a/test/e2e/volume_plugin_test.go +++ b/test/e2e/volume_plugin_test.go @@ -35,7 +35,7 @@ var _ = Describe("Podman volume plugins", func() { AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) os.Unsetenv("CONTAINERS_CONF") }) diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go index cadc12dc4d..6abee31a71 100644 --- a/test/e2e/volume_prune_test.go +++ b/test/e2e/volume_prune_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman volume prune", func() { AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go index f158f966a1..a24f667362 100644 --- a/test/e2e/volume_rm_test.go +++ b/test/e2e/volume_rm_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman volume rm", func() { AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) }) diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go index cf0a77c977..b778f12527 100644 --- a/test/e2e/wait_test.go +++ b/test/e2e/wait_test.go @@ -27,7 +27,7 @@ var _ = Describe("Podman wait", func() { AfterEach(func() { podmanTest.Cleanup() - f := CurrentGinkgoTestDescription() + f := CurrentSpecReport() processTestResult(f) })