From aafbaa49756c5a07c905760ae3f8e43d5dc14e60 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 2 Dec 2021 09:58:36 -0700 Subject: [CI:DOCS] logformatter: fix corner case with links A test name beginning with non-alpha, e.g., "--build should ...", was not being recognized and linkified: https://storage.googleapis.com/cirrus-ci-6707778565701632-fcae48/artifacts/containers/podman/6500723916537856/html/int-podman-fedora-34-rootless-host.log.html Fix that. Also fix two other cases (single/double quotes) that were resulting in weird unreliable links. While I'm at it, add a few usability enhancements: * Colorize [SKIPPING] and [SLOW TEST] * Deemphasize '[It] testname' when it appears mid-test * Replace 'Running:' with a (deemphasized) '#' or '$' prompt Add regression tests Signed-off-by: Ed Santiago --- contrib/cirrus/logformatter.t | 72 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 8 deletions(-) (limited to 'contrib/cirrus/logformatter.t') diff --git a/contrib/cirrus/logformatter.t b/contrib/cirrus/logformatter.t index bd4179b5e..d905693ad 100755 --- a/contrib/cirrus/logformatter.t +++ b/contrib/cirrus/logformatter.t @@ -134,9 +134,35 @@ $SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} [+0103s] 4810be0cfbd42241e349dbe7d50fbc54405cd320a6637c65fd5323f34d64af89 [+0104s] Running: /var/tmp/go/src/github.com/containers/libpod/bin/podman-remote --storage-opt vfs.imagestore=/tmp/podman/imagecachedir --root /tmp/podman_test553496330/crio --runroot /tmp/podman_test553496330/crio-run --runtime /usr/bin/runc --conmon /usr/bin/conmon --cni-config-dir /etc/cni/net.d --cgroup-manager systemd --tmpdir /tmp/podman_test553496330 --events-backend file --storage-driver vfs --remote --url unix:/run/user/12345/podman-xyz.sock pod rm -fa [+0104s] 4810be0cfbd42241e349dbe7d50fbc54405cd320a6637c65fd5323f34d64af89 again + + [+0107s] • -[+0107s] ------------------------------ -[+0107s] podman system reset +[+0523s] ------------------------------ +[+0523s] Podman play kube with build +[+0523s] --build should override image in store +[+0523s] /var/tmp/go/src/github.com/containers/podman/test/e2e/play_build_test.go:215 + + +[+0479s] • +[+0479s] ------------------------------ +[+0479s] Podman pod rm +[+0479s] podman pod rm -a doesn't remove a running container +[+0479s] /var/tmp/go/src/github.com/containers/podman/test/e2e/pod_rm_test.go:119 + + +[+1405s] • +[+1405s] ------------------------------ +[+1405s] Podman run entrypoint +[+1405s] podman run entrypoint == [""] +[+1405s] /var/tmp/go/src/github.com/containers/podman/test/e2e/run_entrypoint_test.go:47 + +[+0184s] S [SKIPPING] [3.086 seconds] +[+1385s] S [SKIPPING] in Spec Setup (BeforeEach) [0.001 seconds] + +[+1512s] Summarizing 6 Failures: +[+1512s] +[+1512s] [Fail] Podman play kube with build [It] --build should override image in store +[+1512s] /var/tmp/go/src/github.com/containers/podman/test/e2e/play_build_test.go:259 >>> $SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} [08:26:19] START - All [+xxxx] lines that follow are relative to right now. @@ -150,9 +176,9 @@ $SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP} /var/tmp/go/src/github.com/containers/podman/test/e2e/pod_restart_test.go:41 [BeforeEach] Podman pod restart /var/tmp/go/src/github.com/containers/podman/test/e2e/pod_restart_test.go:18 - [It] podman pod restart single empty pod + [It] podman pod restart single empty pod /var/tmp/go/src/github.com/containers/podman/test/e2e/pod_restart_test.go:41 - Running: podman # podman [options] pod create --infra=false --share 4810be0cfbd42241e349dbe7d50fbc54405cd320a6637c65fd5323f34d64af89 - Running: podman # podman output: [AfterEach] Podman pod restart /var/tmp/go/src/github.com/containers/podman/test/e2e/pod_restart_test.go:28 - Running: podman # podman [options] pod rm -fa 4810be0cfbd42241e349dbe7d50fbc54405cd320a6637c65fd5323f34d64af89 -[+0104s] Running: podman-remote [+0104s] # podman-remote [+0107s] podman system reset +[+0523s] Podman play kube with build +

--build should override image in store

 + /var/tmp/go/src/github.com/containers/podman/test/e2e/play_build_test.go:215 + + +[+0479s] • + +
+
+[+0479s] Podman pod rm
+         
  podman pod rm -a doesn't remove a running container

+           /var/tmp/go/src/github.com/containers/podman/test/e2e/pod_rm_test.go:119
+
+
+[+1405s] •
+
+
+
+[+1405s] Podman run entrypoint
+         
  podman run entrypoint == [""]

+           /var/tmp/go/src/github.com/containers/podman/test/e2e/run_entrypoint_test.go:47
+
+
+[+0184s] S [SKIPPING] [3.086 seconds]
+[+1385s] S [SKIPPING] in Spec Setup (BeforeEach) [0.001 seconds]
+
+
+[+1512s] Summarizing 6 Failures:
+[+1512s]
+         [Fail] Podman play kube with build [It] --build should override image in store
+         /var/tmp/go/src/github.com/containers/podman/test/e2e/play_build_test.go:259
-- 
cgit v1.2.3-54-g00ecf