aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-09-13 14:22:34 +0200
committerGitHub <noreply@github.com>2022-09-13 14:22:34 +0200
commit351b30311904089c70ae449b941173a197d6066f (patch)
tree02558bcd46a1baef4a76114e39328ae9b463342c /test
parentd88d74639fbabfd83663ea94a11c11c7a54b781b (diff)
parentc8c2aab50d73ab767b8eb720b4d1abbc9bb36b62 (diff)
downloadpodman-351b30311904089c70ae449b941173a197d6066f.tar.gz
podman-351b30311904089c70ae449b941173a197d6066f.tar.bz2
podman-351b30311904089c70ae449b941173a197d6066f.zip
Merge pull request #15752 from vrothberg/fix-15691
health checks: restart timers
Diffstat (limited to 'test')
-rw-r--r--test/system/220-healthcheck.bats6
1 files changed, 2 insertions, 4 deletions
diff --git a/test/system/220-healthcheck.bats b/test/system/220-healthcheck.bats
index 00ec1dd79..a1b24d293 100644
--- a/test/system/220-healthcheck.bats
+++ b/test/system/220-healthcheck.bats
@@ -106,8 +106,7 @@ Log[-1].Output | \"Uh-oh on stdout!\\\nUh-oh on stderr!\"
# healthcheck should now fail, with exit status 1 and 'unhealthy' output
run_podman 1 healthcheck run $ctr
- # FIXME: #15691 - `healthcheck run` may emit an error log that the timer already exists
- is "$output" ".*unhealthy.*" "output from 'podman healthcheck run'"
+ is "$output" "unhealthy" "output from 'podman healthcheck run'"
run_podman inspect $ctr --format "{{.State.Status}} {{.Config.HealthcheckOnFailureAction}}"
if [[ $policy == "restart" ]];then
@@ -118,8 +117,7 @@ Log[-1].Output | \"Uh-oh on stdout!\\\nUh-oh on stderr!\"
# Container is still running and health check still broken
is "$output" "running $policy" "container continued running"
run_podman 1 healthcheck run $ctr
- # FIXME: #15691 - `healthcheck run` may emit an error log that the timer already exists
- is "$output" ".*unhealthy.*" "output from 'podman healthcheck run'"
+ is "$output" "unhealthy" "output from 'podman healthcheck run'"
else
# kill and stop yield the container into a non-running state
is "$output" ".* $policy" "container was stopped/killed"