diff --git a/.golangci.yml b/.golangci.yml index ce19ad10..df1365bb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,9 @@ version: "2" linters: + enable: + - testifylint + settings: errcheck: exclude-functions: diff --git a/phase/configure_k0s_test.go b/phase/configure_k0s_test.go index c1d6e448..fcff40af 100644 --- a/phase/configure_k0s_test.go +++ b/phase/configure_k0s_test.go @@ -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 { diff --git a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/flags_test.go b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/flags_test.go index ba4f6904..5d580b5b 100644 --- a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/flags_test.go +++ b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/flags_test.go @@ -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) }) } @@ -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"]) } diff --git a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/uploadfile_test.go b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/uploadfile_test.go index 2dd43766..67aeb17d 100644 --- a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/uploadfile_test.go +++ b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/uploadfile_test.go @@ -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) { diff --git a/pkg/retry/retry_test.go b/pkg/retry/retry_test.go index 7bc1c4fe..8ebda940 100644 --- a/pkg/retry/retry_test.go +++ b/pkg/retry/retry_test.go @@ -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) }) @@ -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)) }) @@ -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) }) @@ -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) }) } @@ -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)) }