diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter
index e2eebd4eb6..0888fc8959 100755
--- a/contrib/cirrus/logformatter
+++ b/contrib/cirrus/logformatter
@@ -667,6 +667,13 @@ END_HTML
$subtest_name .= $2;
my $id = make_id($subtest_name, 'anchor');
$line = "$line
";
+
+ # Special case for tests that fail outside of a Describe()
+ # block, e.g., global After/BeforeEach. We still want to
+ # highlight those in the , but do not include "TOP-LEVEL"
+ # in the anchor name for the actual test name (which will
+ # come later, a few lines down).
+ $subtest_name = '' if $subtest_name =~ /^\s*TOP-LEVEL/;
}
}
++$after_divider;
@@ -680,6 +687,7 @@ END_HTML
# 1 2 2 3 3 4 4 15 5
if ($line =~ /^(\s*\[(FAIL|PANIC!)\] (.*) \[(It|BeforeEach|AfterEach)\] )([A-Za-z-].*)/) {
my ($lhs, $type, $desc, $ginkgo_fluff, $testname) = ($1, $2, $3, $4, $5);
+ $desc =~ s/^TOP-LEVEL\s*//;
my $id = make_id("$desc $testname", 'link');
$line = "$lhs$testname";
diff --git a/contrib/cirrus/logformatter.t b/contrib/cirrus/logformatter.t
index 4513e11d7c..0387b8bf48 100755
--- a/contrib/cirrus/logformatter.t
+++ b/contrib/cirrus/logformatter.t
@@ -186,7 +186,7 @@ ok 4 blah
[+0006s] CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags '-X github.com/containers/podman/v4/libpod/define.gitCommit=074143b0fac7af72cd92048d27931a92fe745084 -X github.com/containers/podman/v4/libpod/define.buildInfo=1681728434 -X github.com/containers/podman/v4/libpod/config._installPrefix=/usr/local -X github.com/containers/podman/v4/libpod/config._etcDir=/usr/local/etc -X github.com/containers/podman/v4/pkg/systemd/quadlet._binDir=/usr/local/bin -X github.com/containers/common/pkg/config.additionalHelperBinariesDir= ' -o test/goecho/goecho ./test/goecho
[+0006s] ./hack/install_catatonit.sh
[+0270s] ------------------------------
-[+0271s] ⢠[3.327 seconds]
+[+0271s] • [3.327 seconds]
[+0271s] Podman restart
[+0271s] /var/tmp/go/src/github.com/containers/podman/test/e2e/restart_test.go:14
[+0271s] podman restart non-stop container with short timeout
@@ -210,6 +210,25 @@ ok 4 blah
[+0271s] 7f5f8fb3d043984cdff65994d14c4fd157479d20e0a0fcf769c35b50e8975edc
[+0271s] < Exit [AfterEach] Podman restart - /var/tmp/go/src/github.com/containers/podman/test/e2e/restart_test.go:30 @ 04/17/23 10:00:31.979 (645ms)
[+0271s] << Timeline
+[+0296s] ------------------------------
+[+0298s] • [FAILED] [6.071 seconds]
+[+0298s] TOP-LEVEL [AfterEach]
+[+0298s] /var/tmp/go/src/github.com/containers/podman/test/e2e/common_test.go:117
+[+0298s] Podman pod create
+[+0298s] /var/tmp/go/src/github.com/containers/podman/test/e2e/pod_infra_container_test.go:12
+[+0298s] podman pod correctly sets up PIDNS
+[+0298s] /var/tmp/go/src/github.com/containers/podman/test/e2e/pod_infra_container_test.go:154
+[+0298s]&TRAILINGSPACE;&TRAILINGSPACE;&TRAILINGSPACE;
+[+0298s] Timeline >>
+[+0298s] << Timeline
+[+1741s] ------------------------------
+[+1741s]&TRAILINGSPACE;
+[+1741s] Summarizing 1 Failure:
+[+1741s] [FAIL] TOP-LEVEL [AfterEach] Podman pod create podman pod correctly sets up PIDNS
+[+1741s] /var/tmp/go/src/github.com/containers/podman/test/e2e/common_test.go:657
+[+1741s]&TRAILINGSPACE;
+[+1741s] Ran 1889 of 2014 Specs in 1607.919 seconds
+[+1741s] FAIL! -- 1881 Passed | 1 Failed | 0 Pending | 125 Skipped
>>>
[05:47:08] START - All [+xxxx] lines that follow are relative to 2023-04-17T05:47:08.
[+0004s] CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags '-X github.com/containers/podman/v4/libpod/define.gitCommit=074143b0fac7af72cd92048d27931a92fe745084 -X github.com/containers/podman/v4/libpod/define.buildInfo=1681728432 -X github.com/containers/podman/v4/libpod/config._installPrefix=/usr/local -X github.com/containers/podman/v4/libpod/config._etcDir=/usr/local/etc -X github.com/containers/podman/v4/pkg/systemd/quadlet._binDir=/usr/local/bin -X github.com/containers/common/pkg/config.additionalHelperBinariesDir= ' -tags " selinux systemd exclude_graphdriver_devicemapper seccomp" -o test/checkseccomp/checkseccomp ./test/checkseccomp
@@ -218,7 +237,7 @@ ok 4 blah
-[+0271s] ⢠[3.327 seconds]
+[+0271s] • [3.327 seconds]
Podman restart
/var/tmp/go/src/github.com/containers/podman/test/e2e/restart_test.go:14
podman restart non-stop container with short timeout
@@ -297,7 +316,29 @@ ok 4 blah
7f5f8fb3d043984cdff65994d14c4fd157479d20e0a0fcf769c35b50e8975edc
← Exit [AfterEach] Podman restart - /var/tmp/go/src/github.com/containers/podman/test/e2e/restart_test.go:30 @ 04/17/23 10:00:31.979 (645ms)
<< Timeline
-
+
+
+
+[+0298s] • [FAILED] [6.071 seconds]
+ TOP-LEVEL [AfterEach]
+ /var/tmp/go/src/github.com/containers/podman/test/e2e/common_test.go:117
+ Podman pod create
+ /var/tmp/go/src/github.com/containers/podman/test/e2e/pod_infra_container_test.go:12
+ podman pod correctly sets up PIDNS
+ /var/tmp/go/src/github.com/containers/podman/test/e2e/pod_infra_container_test.go:154
+ &TRAILINGSPACE;&TRAILINGSPACE;
+ Timeline >>
+ << Timeline
+
+
+
+[+1741s]
+ Summarizing 1 Failure:
+ [FAIL] TOP-LEVEL [AfterEach] Podman pod create podman pod correctly sets up PIDNS
+ /var/tmp/go/src/github.com/containers/podman/test/e2e/common_test.go:657
+
+ Ran 1889 of 2014 Specs in 1607.919 seconds
+ FAIL! -- 1881 Passed | 1 Failed | 0 Pending | 125 Skipped
== simple python