diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-04-06 08:17:42 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2022-04-25 14:25:10 -0600 |
| commit | ee9d755c5b86ef996a7896f09e6e91ee5e488af7 (patch) | |
| tree | 718919a8183f4d3c1be5fb977ff764e965e70272 /test/e2e/common_test.go | |
| parent | 181c9d3ee3ad4820b9ae91f1f02faf7b9e65fc87 (diff) | |
| download | podman-ee9d755c5b86ef996a7896f09e6e91ee5e488af7.tar.gz podman-ee9d755c5b86ef996a7896f09e6e91ee5e488af7.tar.bz2 podman-ee9d755c5b86ef996a7896f09e6e91ee5e488af7.zip | |
Robustify nginx tests
[skip ci]
While chasing a flake, I discovered that our alpine_nginx
image is broken: it returns 404 on all requests. We never
caught this because--surprise!--curl exits 0 even when
server returns 4xx/5xx status.
Let's be strict: add -f (--fail) option to all invocations
of curl.
And, although I couldn't identify the root cause of the
flake (in "run two containers with the same IP" test),
I can at least fix the broken wait-for-nginx loop, bump
up the number of retries, and improve diagnostics on
failure. And add a strict error-message check.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 766f39964..6846a5677 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -462,7 +462,8 @@ func (p *PodmanTestIntegration) RunNginxWithHealthCheck(name string) (*PodmanSes if name != "" { podmanArgs = append(podmanArgs, "--name", name) } - podmanArgs = append(podmanArgs, "-dt", "-P", "--health-cmd", "curl http://localhost/", nginx) + // curl without -f exits 0 even if http code >= 400! + podmanArgs = append(podmanArgs, "-dt", "-P", "--health-cmd", "curl -f http://localhost/", nginx) session := p.Podman(podmanArgs) session.WaitWithDefaultTimeout() return session, session.OutputToString() |