Skip to content

[Do not merge] [META]: CI fixes collection #4361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Do not merge] [META]: CI fixes collection #4361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ linters:
arguments: [7]
- name: function-length
# 155 occurrences (at default 0, 75). Really long functions should really be broken up in most cases.
arguments: [0, 450]
arguments: [0, 500]
- name: cyclomatic
# 204 occurrences (at default 10)
arguments: [100]
Expand Down
32 changes: 31 additions & 1 deletion cmd/nerdctl/container/container_health_check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
package container

import (
"encoding/json"
"errors"
"fmt"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -83,6 +85,8 @@ func TestContainerHealthCheckBasic(t *testing.T) {
Output: expect.All(func(stdout string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state to be present")
assert.Equal(t, healthcheck.Healthy, h.Status)
assert.Equal(t, 0, h.FailingStreak)
Expand Down Expand Up @@ -158,6 +162,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(stdout string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.FailingStreak, 1)
assert.Assert(t, len(inspect.State.Health.Log) > 0, "expected health log to have entries")
Expand Down Expand Up @@ -194,6 +200,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(stdout string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Unhealthy)
assert.Equal(t, h.FailingStreak, 2)
Expand Down Expand Up @@ -224,6 +232,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(stdout string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Starting)
assert.Equal(t, h.FailingStreak, 0)
Expand Down Expand Up @@ -253,6 +263,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(stdout string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Unhealthy)
assert.Equal(t, h.FailingStreak, 1)
Expand Down Expand Up @@ -303,6 +315,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(_ string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Healthy)
assert.Assert(t, len(h.Log) > 0)
Expand Down Expand Up @@ -334,6 +348,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(stdout string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Healthy)
assert.Assert(t, h.FailingStreak == 0)
Expand Down Expand Up @@ -365,6 +381,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(stdout string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Healthy)
assert.Equal(t, h.FailingStreak, 0)
Expand Down Expand Up @@ -398,11 +416,13 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(_ string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Healthy)
assert.Assert(t, len(h.Log) >= 3, "expected at least 3 health log entries")
for _, log := range h.Log {
assert.Assert(t, len(log.Output) >= 1024, "each output should be >= 1024 bytes")
assert.Assert(t, len(log.Output) >= 1024, fmt.Sprintf("each output should be >= 1024 bytes, was: %s", log.Output))
}
}),
}
Expand Down Expand Up @@ -434,6 +454,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(_ string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Unhealthy)
assert.Assert(t, len(h.Log) <= 5, "expected health log to contain at most 5 entries")
Expand Down Expand Up @@ -462,6 +484,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(_ string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Healthy)
assert.Equal(t, h.FailingStreak, 0)
Expand Down Expand Up @@ -499,6 +523,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(stdout string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Unhealthy)
assert.Assert(t, h.FailingStreak >= 3)
Expand Down Expand Up @@ -532,6 +558,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(stdout string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Starting)
assert.Equal(t, h.FailingStreak, 0, "failing streak should not increase during start period")
Expand Down Expand Up @@ -561,6 +589,8 @@ func TestContainerHealthCheckAdvance(t *testing.T) {
Output: expect.All(func(stdout string, t tig.T) {
inspect := nerdtest.InspectContainer(helpers, data.Identifier())
h := inspect.State.Health
debug, _ := json.MarshalIndent(h, "", " ")
t.Log(string(debug))
assert.Assert(t, h != nil, "expected health state")
assert.Equal(t, h.Status, healthcheck.Healthy, "expected healthy status even during start-period")
assert.Equal(t, h.FailingStreak, 0)
Expand Down
Loading