opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20897 from edsantiago/apiv2-race

Browse Source 
apiv2 tests: fix race
This commit is contained in:
openshift-merge-bot[bot]
2023-12-04 18:00:23 +00:00
committed by GitHub
parent cbb3e4d20f 7f4b0f2087
commit 3636869f04
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/apiv2/27-containersEvents.at
View File

@ -8,7 +8,7 @@ podman pull $IMAGE &>/dev/null
# Ensure clean slate # Ensure clean slate
podman rm -a -f &>/dev/null podman rm -a -f &>/dev/null
START=$(date +%s) START=$(date +%s.%N)
podman run --rm $IMAGE false || true podman run --rm $IMAGE false || true

3
test/apiv2/test-apiv2
View File

@ -147,7 +147,8 @@ function like() {
function _show_ok() { function _show_ok() {
local ok=$1 local ok=$1
# Exec tests include control characters; filter them out # 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 # If output is a tty, colorize pass/fail
local red= local red=