Skip to content

Commit dd21bae

Browse files
committed
Debug 4343
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
1 parent b25edf5 commit dd21bae

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ linters:
121121
arguments: [7]
122122
- name: function-length
123123
# 155 occurrences (at default 0, 75). Really long functions should really be broken up in most cases.
124-
arguments: [0, 450]
124+
arguments: [0, 500]
125125
- name: cyclomatic
126126
# 204 occurrences (at default 10)
127127
arguments: [100]

cmd/nerdctl/container/container_health_check_test.go

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
package container
1818

1919
import (
20+
"encoding/json"
2021
"errors"
22+
"fmt"
2123
"strings"
2224
"testing"
2325
"time"
@@ -83,6 +85,8 @@ func TestContainerHealthCheckBasic(t *testing.T) {
8385
Output: expect.All(func(stdout string, t tig.T) {
8486
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
8587
h := inspect.State.Health
88+
debug, _ := json.MarshalIndent(h, "", " ")
89+
t.Log(string(debug))
8690
assert.Assert(t, h != nil, "expected health state to be present")
8791
assert.Equal(t, healthcheck.Healthy, h.Status)
8892
assert.Equal(t, 0, h.FailingStreak)
@@ -158,6 +162,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
158162
Output: expect.All(func(stdout string, t tig.T) {
159163
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
160164
h := inspect.State.Health
165+
debug, _ := json.MarshalIndent(h, "", " ")
166+
t.Log(string(debug))
161167
assert.Assert(t, h != nil, "expected health state")
162168
assert.Equal(t, h.FailingStreak, 1)
163169
assert.Assert(t, len(inspect.State.Health.Log) > 0, "expected health log to have entries")
@@ -194,6 +200,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
194200
Output: expect.All(func(stdout string, t tig.T) {
195201
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
196202
h := inspect.State.Health
203+
debug, _ := json.MarshalIndent(h, "", " ")
204+
t.Log(string(debug))
197205
assert.Assert(t, h != nil, "expected health state")
198206
assert.Equal(t, h.Status, healthcheck.Unhealthy)
199207
assert.Equal(t, h.FailingStreak, 2)
@@ -224,6 +232,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
224232
Output: expect.All(func(stdout string, t tig.T) {
225233
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
226234
h := inspect.State.Health
235+
debug, _ := json.MarshalIndent(h, "", " ")
236+
t.Log(string(debug))
227237
assert.Assert(t, h != nil, "expected health state")
228238
assert.Equal(t, h.Status, healthcheck.Starting)
229239
assert.Equal(t, h.FailingStreak, 0)
@@ -253,6 +263,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
253263
Output: expect.All(func(stdout string, t tig.T) {
254264
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
255265
h := inspect.State.Health
266+
debug, _ := json.MarshalIndent(h, "", " ")
267+
t.Log(string(debug))
256268
assert.Assert(t, h != nil, "expected health state")
257269
assert.Equal(t, h.Status, healthcheck.Unhealthy)
258270
assert.Equal(t, h.FailingStreak, 1)
@@ -303,6 +315,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
303315
Output: expect.All(func(_ string, t tig.T) {
304316
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
305317
h := inspect.State.Health
318+
debug, _ := json.MarshalIndent(h, "", " ")
319+
t.Log(string(debug))
306320
assert.Assert(t, h != nil, "expected health state")
307321
assert.Equal(t, h.Status, healthcheck.Healthy)
308322
assert.Assert(t, len(h.Log) > 0)
@@ -334,6 +348,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
334348
Output: expect.All(func(stdout string, t tig.T) {
335349
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
336350
h := inspect.State.Health
351+
debug, _ := json.MarshalIndent(h, "", " ")
352+
t.Log(string(debug))
337353
assert.Assert(t, h != nil, "expected health state")
338354
assert.Equal(t, h.Status, healthcheck.Healthy)
339355
assert.Assert(t, h.FailingStreak == 0)
@@ -365,6 +381,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
365381
Output: expect.All(func(stdout string, t tig.T) {
366382
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
367383
h := inspect.State.Health
384+
debug, _ := json.MarshalIndent(h, "", " ")
385+
t.Log(string(debug))
368386
assert.Assert(t, h != nil, "expected health state")
369387
assert.Equal(t, h.Status, healthcheck.Healthy)
370388
assert.Equal(t, h.FailingStreak, 0)
@@ -398,11 +416,13 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
398416
Output: expect.All(func(_ string, t tig.T) {
399417
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
400418
h := inspect.State.Health
419+
debug, _ := json.MarshalIndent(h, "", " ")
420+
t.Log(string(debug))
401421
assert.Assert(t, h != nil, "expected health state")
402422
assert.Equal(t, h.Status, healthcheck.Healthy)
403423
assert.Assert(t, len(h.Log) >= 3, "expected at least 3 health log entries")
404424
for _, log := range h.Log {
405-
assert.Assert(t, len(log.Output) >= 1024, "each output should be >= 1024 bytes")
425+
assert.Assert(t, len(log.Output) >= 1024, fmt.Sprintf("each output should be >= 1024 bytes, was: %s", log.Output))
406426
}
407427
}),
408428
}
@@ -434,6 +454,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
434454
Output: expect.All(func(_ string, t tig.T) {
435455
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
436456
h := inspect.State.Health
457+
debug, _ := json.MarshalIndent(h, "", " ")
458+
t.Log(string(debug))
437459
assert.Assert(t, h != nil, "expected health state")
438460
assert.Equal(t, h.Status, healthcheck.Unhealthy)
439461
assert.Assert(t, len(h.Log) <= 5, "expected health log to contain at most 5 entries")
@@ -462,6 +484,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
462484
Output: expect.All(func(_ string, t tig.T) {
463485
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
464486
h := inspect.State.Health
487+
debug, _ := json.MarshalIndent(h, "", " ")
488+
t.Log(string(debug))
465489
assert.Assert(t, h != nil, "expected health state")
466490
assert.Equal(t, h.Status, healthcheck.Healthy)
467491
assert.Equal(t, h.FailingStreak, 0)
@@ -499,6 +523,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
499523
Output: expect.All(func(stdout string, t tig.T) {
500524
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
501525
h := inspect.State.Health
526+
debug, _ := json.MarshalIndent(h, "", " ")
527+
t.Log(string(debug))
502528
assert.Assert(t, h != nil, "expected health state")
503529
assert.Equal(t, h.Status, healthcheck.Unhealthy)
504530
assert.Assert(t, h.FailingStreak >= 3)
@@ -532,6 +558,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
532558
Output: expect.All(func(stdout string, t tig.T) {
533559
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
534560
h := inspect.State.Health
561+
debug, _ := json.MarshalIndent(h, "", " ")
562+
t.Log(string(debug))
535563
assert.Assert(t, h != nil, "expected health state")
536564
assert.Equal(t, h.Status, healthcheck.Starting)
537565
assert.Equal(t, h.FailingStreak, 0, "failing streak should not increase during start period")
@@ -561,6 +589,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
561589
Output: expect.All(func(stdout string, t tig.T) {
562590
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
563591
h := inspect.State.Health
592+
debug, _ := json.MarshalIndent(h, "", " ")
593+
t.Log(string(debug))
564594
assert.Assert(t, h != nil, "expected health state")
565595
assert.Equal(t, h.Status, healthcheck.Healthy, "expected healthy status even during start-period")
566596
assert.Equal(t, h.FailingStreak, 0)

0 commit comments

Comments
 (0)