Skip to content

Commit 1024760

Browse files
fahedouchfahedouch
authored
Merge pull request #4349 from apostasie/2025-06-fix-healthcheck-tests
Ensure container started on healthcheck tests
2 parents 9c56cda + df3df35 commit 1024760

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

‎cmd/nerdctl/container/container_health_check_test.go‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ func TestContainerHealthCheckBasic(t *testing.T) {
5050
Setup: func(data test.Data, helpers test.Helpers) {
5151
helpers.Ensure("run", "-d", "--name", data.Identifier(),
5252
testutil.CommonImage, "sleep", nerdtest.Infinity)
53+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
5354
},
5455
Cleanup: func(data test.Data, helpers test.Helpers) {
5556
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -67,6 +68,7 @@ func TestContainerHealthCheckBasic(t *testing.T) {
6768
"--health-interval", "45s",
6869
"--health-timeout", "30s",
6970
testutil.CommonImage, "sleep", nerdtest.Infinity)
71+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
7072
},
7173
Cleanup: func(data test.Data, helpers test.Helpers) {
7274
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -95,6 +97,7 @@ func TestContainerHealthCheckBasic(t *testing.T) {
9597
"--health-cmd", "echo healthy",
9698
"--health-interval", "3s",
9799
testutil.CommonImage, "sleep", "2")
100+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
98101
helpers.Ensure("stop", data.Identifier())
99102
},
100103
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -140,6 +143,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
140143
"--health-timeout", "2s",
141144
"--health-interval", "1s",
142145
testutil.CommonImage, "sleep", nerdtest.Infinity)
146+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
143147
},
144148
Cleanup: func(data test.Data, helpers test.Helpers) {
145149
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -170,6 +174,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
170174
"--health-interval", "1s",
171175
"--health-retries", "2",
172176
testutil.CommonImage, "sleep", nerdtest.Infinity)
177+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
173178
},
174179
Cleanup: func(data test.Data, helpers test.Helpers) {
175180
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -204,6 +209,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
204209
"--health-start-period", "5s",
205210
"--health-retries", "2",
206211
testutil.CommonImage, "sleep", nerdtest.Infinity)
212+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
207213
},
208214
Cleanup: func(data test.Data, helpers test.Helpers) {
209215
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -232,6 +238,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
232238
"--health-interval", "1s",
233239
"--health-retries", "1",
234240
testutil.CommonImage, "sleep", nerdtest.Infinity)
241+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
235242
},
236243
Cleanup: func(data test.Data, helpers test.Helpers) {
237244
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -257,6 +264,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
257264
Setup: func(data test.Data, helpers test.Helpers) {
258265
helpers.Ensure("run", "-d", "--name", data.Identifier(),
259266
"--no-healthcheck", testutil.CommonImage, "sleep", nerdtest.Infinity)
267+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
260268
},
261269
Cleanup: func(data test.Data, helpers test.Helpers) {
262270
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -280,6 +288,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
280288
helpers.Ensure("run", "-d", "--name", data.Identifier(),
281289
"--health-cmd", "echo shell-format", "--health-interval", "1s",
282290
testutil.CommonImage, "sleep", nerdtest.Infinity)
291+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
283292
},
284293
Cleanup: func(data test.Data, helpers test.Helpers) {
285294
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -310,6 +319,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
310319
"--health-interval", "1s",
311320
"--health-timeout", "1s",
312321
testutil.CommonImage, "sleep", nerdtest.Infinity)
322+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
313323
},
314324
Cleanup: func(data test.Data, helpers test.Helpers) {
315325
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -340,6 +350,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
340350
"--health-interval", "1s",
341351
"--health-timeout", "1s",
342352
testutil.CommonImage, "sleep", nerdtest.Infinity)
353+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
343354
},
344355
Cleanup: func(data test.Data, helpers test.Helpers) {
345356
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -368,6 +379,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
368379
"--health-cmd", "yes X | head -c 60000",
369380
"--health-interval", "1s", "--health-timeout", "2s",
370381
testutil.CommonImage, "sleep", nerdtest.Infinity)
382+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
371383
},
372384
Cleanup: func(data test.Data, helpers test.Helpers) {
373385
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -403,6 +415,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
403415
"--health-interval", "1s",
404416
"--health-retries", "1",
405417
testutil.CommonImage, "sleep", nerdtest.Infinity)
418+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
406419
},
407420
Cleanup: func(data test.Data, helpers test.Helpers) {
408421
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -434,6 +447,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
434447
"--health-cmd", "yes X | head -c 1048576", // 1MB output
435448
"--health-interval", "1s", "--health-timeout", "2s",
436449
testutil.CommonImage, "sleep", nerdtest.Infinity)
450+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
437451
},
438452
Cleanup: func(data test.Data, helpers test.Helpers) {
439453
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -466,6 +480,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
466480
"--health-timeout", "10s",
467481
"--health-retries", "3",
468482
testutil.CommonImage, "sleep", nerdtest.Infinity)
483+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
469484
},
470485
Cleanup: func(data test.Data, helpers test.Helpers) {
471486
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -497,6 +512,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
497512
"--health-cmd", "ls /foo || exit 1", "--health-retries", "2",
498513
"--health-start-period", "30s", // long enough to stay in "starting"
499514
testutil.CommonImage, "sleep", nerdtest.Infinity)
515+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
500516
},
501517
Cleanup: func(data test.Data, helpers test.Helpers) {
502518
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -528,6 +544,7 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
528544
helpers.Ensure("run", "-d", "--name", data.Identifier(),
529545
"--health-cmd", "ls || exit 1", "--health-retries", "2",
530546
testutil.CommonImage, "sleep", nerdtest.Infinity)
547+
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
531548
},
532549
Cleanup: func(data test.Data, helpers test.Helpers) {
533550
helpers.Anyhow("rm", "-f", data.Identifier())

0 commit comments

Comments
 (0)