Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
version: "2"

linters:
enable:
- testifylint

settings:
errcheck:
exclude-functions:
Expand Down
2 changes: 1 addition & 1 deletion phase/configure_k0s_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func TestConfigForLeavesAPIAddressWhenIPv6NodeLocalLBDisabled(t *testing.T) {

config, err := p.configFor(h)
require.NoError(t, err)
require.Equal(t, "", apiAddressFromConfig(t, config))
require.Empty(t, apiAddressFromConfig(t, config))
}

type apiSpec struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/flags_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func TestGetBoolean(t *testing.T) {
flags := Flags{"--flag1=1", "--flag2"}
result, err := flags.GetBoolean("--flag3")
require.NoError(t, err)
require.Equal(t, result, false)
require.False(t, result)
})
}

Expand All @@ -120,7 +120,7 @@ func TestMap(t *testing.T) {
flags := Flags{"--flag1", "--flag2=foo", "--flag3=bar"}
m := flags.Map()
require.Len(t, m, 3)
require.Equal(t, "", m["--flag1"])
require.Empty(t, m["--flag1"])
require.Equal(t, "foo", m["--flag2"])
require.Equal(t, "bar", m["--flag3"])
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ func TestUploadFileResolveRelativeURLSetsDestination(t *testing.T) {
u := &UploadFile{Source: "https://example.com/assets/app.tar.gz", DestinationDir: "/opt"}
require.NoError(t, u.ResolveRelativeTo(""))
require.Equal(t, "/opt/app.tar.gz", u.DestinationFile)
require.Equal(t, "", u.Base)
require.Len(t, u.Sources, 0)
require.Empty(t, u.Base)
require.Empty(t, u.Sources)
}

func TestUploadFileResolveRelativeSingleFile(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions pkg/retry/retry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func TestTimeout(t *testing.T) {
})
elapsed := time.Since(start)

assert.Error(t, err)
assert.Error(t, err) //nolint:testifylint
assert.Less(t, elapsed, 50*time.Millisecond)
})

Expand All @@ -99,7 +99,7 @@ func TestTimeout(t *testing.T) {
})
elapsed := time.Since(start)

assert.Error(t, err)
assert.Error(t, err) //nolint:testifylint
assert.GreaterOrEqual(t, elapsed.Milliseconds(), int64(10))
})

Expand Down Expand Up @@ -136,7 +136,7 @@ func TestTimes(t *testing.T) {
tries++
return errors.New("some error")
})
assert.Error(t, err, "foo")
assert.Error(t, err, "foo") //nolint:testifylint
assert.Equal(t, 2, tries)
})

Expand All @@ -146,7 +146,7 @@ func TestTimes(t *testing.T) {
tries++
return errors.Join(ErrAbort, errors.New("some error"))
})
assert.Error(t, err, "foo")
assert.Error(t, err, "foo") //nolint:testifylint
assert.Equal(t, 1, tries)
})
}
Expand All @@ -165,6 +165,6 @@ func TestWithDefaultTimeout(t *testing.T) {
})
elapsed := time.Since(start)

assert.Error(t, err)
assert.Error(t, err) //nolint:testifylint
assert.GreaterOrEqual(t, elapsed.Milliseconds(), int64(5))
}
Loading