Skip to content

Commit 431f0f5

Browse files
committed
linters/testifylint: fix windows file issues
Fixes: pkg/errmetrics/err_msg_windows_test.go:16:2 testifylint bool-compare: use assert.True pkg/errmetrics/err_msg_windows_test.go:19:2 testifylint bool-compare: use assert.True pkg/ktime/ktime_windows_test.go:16:2 testifylint negative-positive: use assert.Positive pkg/ktime/ktime_windows_test.go:27:2 testifylint negative-positive: use assert.Positive pkg/ktime/ktime_windows_test.go:32:2 testifylint expected-actual: need to reverse actual and expected values pkg/reader/proc/proc_windows_test.go:21:2 testifylint error-nil: use assert.NoError pkg/reader/proc/proc_windows_test.go:31:2 testifylint error-nil: use assert.NoError pkg/reader/proc/proc_windows_test.go:36:2 testifylint error-nil: use assert.NoError pkg/reader/proc/proc_windows_test.go:41:2 testifylint error-nil: use assert.NoError pkg/reader/proc/proc_windows_test.go:46:2 testifylint error-nil: use assert.NoError pkg/reader/proc/proc_windows_test.go:21:2 testifylint require-error: for error assertions use require pkg/reader/proc/proc_windows_test.go:31:2 testifylint require-error: for error assertions use require pkg/reader/proc/proc_windows_test.go:36:2 testifylint require-error: for error assertions use require pkg/reader/proc/proc_windows_test.go:41:2 testifylint require-error: for error assertions use require pkg/reader/proc/proc_windows_test.go:46:2 testifylint require-error: for error assertions use require Signed-off-by: Mahe Tardy <[email protected]>
1 parent 788cd50 commit 431f0f5

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

pkg/errmetrics/err_msg_windows_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313

1414
func TestErrMessage(t *testing.T) {
1515
s1 := GetErrorMessage(uint16(syscall.ERROR_ACCESS_DENIED))
16-
assert.Equal(t, strings.HasPrefix(s1, "Access is denied."), true)
16+
assert.True(t, strings.HasPrefix(s1, "Access is denied."))
1717

1818
s2 := GetErrorMessage(uint16(syscall.ERROR_INSUFFICIENT_BUFFER))
19-
assert.Equal(t, strings.HasPrefix(s2, "The data area passed to a system call is too small."), true)
19+
assert.True(t, strings.HasPrefix(s2, "The data area passed to a system call is too small."))
2020

2121
}

pkg/ktime/ktime_windows_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
func TestKtime(t *testing.T) {
1414
time1, err := NanoTimeSince(0)
1515
require.NoError(t, err)
16-
assert.Greater(t, time1.Milliseconds(), int64(0))
16+
assert.Positive(t, time1.Milliseconds())
1717
time2, err := NanoTimeSince(0)
1818
require.NoError(t, err)
1919
assert.GreaterOrEqual(t, time2, time1)
@@ -24,10 +24,10 @@ func TestBoottime(t *testing.T) {
2424
require.NoError(t, err)
2525
ktime1, err := DecodeKtime(time1.Nanoseconds(), false)
2626
require.NoError(t, err)
27-
assert.Greater(t, ktime1.UnixMilli(), int64(0))
27+
assert.Positive(t, ktime1.UnixMilli())
2828
}
2929

3030
func TestKernelTime(t *testing.T) {
3131
uTime, _ := DecodeKtime(133918958189958838, false)
32-
assert.Equal(t, uTime.Unix(), int64(1747422218))
32+
assert.Equal(t, int64(1747422218), uTime.Unix())
3333
}

pkg/reader/proc/proc_windows_test.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@
44
package proc
55

66
import (
7-
"fmt"
87
"os"
98
"syscall"
109
"testing"
1110
"unsafe"
1211

13-
"github.com/stretchr/testify/assert"
12+
"github.com/stretchr/testify/require"
1413
"golang.org/x/sys/windows"
1514
)
1615

1716
func TestGetProcStatStrings(t *testing.T) {
1817
pid := os.Getpid() // Get the current process's PID
1918

2019
status, err := GetStatus(uint32(pid))
21-
assert.Equal(t, err, nil)
20+
require.NoError(t, err)
2221
t.Log("User = ", status.Uids)
2322
t.Log("Group = ", status.Gids)
2423
t.Log("LoginUId = ", status.LoginUid)
@@ -28,21 +27,21 @@ func TestFillLoginUid(t *testing.T) {
2827
pid := os.Getpid() // Get the current process's PID
2928

3029
c, err := windows.OpenProcess(windows.PROCESS_QUERY_LIMITED_INFORMATION, false, uint32(pid))
31-
assert.Equal(t, err, nil)
30+
require.NoError(t, err)
3231
defer windows.CloseHandle(c)
3332

3433
var token syscall.Token
3534
err = syscall.OpenProcessToken(syscall.Handle(c), syscall.TOKEN_QUERY, &token)
36-
assert.Equal(t, err, nil)
35+
require.NoError(t, err)
3736
defer token.Close()
3837
var logonSid *TokenGroups
3938

4039
ret, err := getTokenInfo(token, windows.TokenLogonSid, 32)
41-
assert.Equal(t, err, nil)
40+
require.NoError(t, err)
4241
logonSid = (*TokenGroups)(ret)
4342
tokenUser := (*syscall.SIDAndAttributes)(unsafe.Pointer(&logonSid.Groups[0]))
4443
sid := (*syscall.SID)(unsafe.Pointer(&tokenUser.Sid))
4544
str, err1 := sid.String()
46-
assert.Equal(t, err1, nil)
47-
fmt.Printf("SID = %s", str)
45+
require.NoError(t, err1)
46+
t.Logf("SID = %s", str)
4847
}

0 commit comments

Comments
 (0)