mirror of
https://github.com/containers/podman.git
synced 2025-06-19 16:33:24 +08:00
Merge pull request #20897 from edsantiago/apiv2-race
apiv2 tests: fix race
This commit is contained in:
@ -8,7 +8,7 @@ podman pull $IMAGE &>/dev/null
|
||||
# Ensure clean slate
|
||||
podman rm -a -f &>/dev/null
|
||||
|
||||
START=$(date +%s)
|
||||
START=$(date +%s.%N)
|
||||
|
||||
podman run --rm $IMAGE false || true
|
||||
|
||||
|
@ -147,7 +147,8 @@ function like() {
|
||||
function _show_ok() {
|
||||
local ok=$1
|
||||
# Exec tests include control characters; filter them out
|
||||
local testname=$(tr -d \\012 <<<"$2"|cat -vT)
|
||||
# Also filter out timestamps, to get consistent test names in logs
|
||||
local testname=$(tr -d \\012 <<<"$2"|sed -e 's/since=[0-9.]\+/since=(T)/'|cat -vT)
|
||||
|
||||
# If output is a tty, colorize pass/fail
|
||||
local red=
|
||||
|
Reference in New Issue
Block a user