chore(linters): Fix findings found by testifylint for Windows and ena…

…ble it. (#14238)

.golangci.yml

@@ -31,6 +31,7 @@ linters:
     - sqlclosecheck
     - staticcheck
     - tenv
+    - testifylint
     - tparallel
     - typecheck
     - unconvert
@@ -246,6 +247,22 @@ linters-settings:
     # Otherwise, only methods that take `*testing.T`, `*testing.B`, and `testing.TB` as arguments are checked.
     # Default: false
     all: true
+  testifylint:
+    # Enable specific checkers.
+    # https://github.com/Antonboom/testifylint#checkers
+    # Default: ["bool-compare", "compares", "empty", "error-is-as", "error-nil", "expected-actual", "float-compare", "len", "require-error", "suite-dont-use-pkg", "suite-extra-assert-call"]
+    enable:
+      - bool-compare
+      - compares
+      - empty
+      - error-is-as
+      - error-nil
+      - expected-actual
+      - len
+      - require-error
+      - suite-dont-use-pkg
+      - suite-extra-assert-call
+      - suite-thelper
 
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m

cmd/telegraf/main_win_test.go

@@ -33,6 +33,6 @@ func TestWindowsFlagsAreSet(t *testing.T) {
 	require.Equal(t, expectedString, m.serviceName)
 	require.Equal(t, expectedString, m.serviceDisplayName)
 	require.Equal(t, expectedString, m.serviceRestartDelay)
-	require.Equal(t, true, m.serviceAutoRestart)
-	require.Equal(t, true, m.console)
+	require.True(t, m.serviceAutoRestart)
+	require.True(t, m.console)
 }

plugins/inputs/ping/ping_windows_test.go

@@ -368,7 +368,7 @@ func TestPingBinary(t *testing.T) {
 		Urls:   []string{"www.google.com"},
 		Binary: "ping6",
 		pingHost: func(binary string, timeout float64, args ...string) (string, error) {
-			require.True(t, binary == "ping6")
+			require.Equal(t, "ping6", binary)
 			return "", nil
 		},
 	}

plugins/inputs/procstat/native_finder_windows_test.go

@@ -17,7 +17,7 @@ func TestGather_RealPatternIntegration(t *testing.T) {
 	pids, err := pg.Pattern(`procstat`)
 	require.NoError(t, err)
 	fmt.Println(pids)
-	require.Equal(t, true, len(pids) > 0)
+	require.NotEmpty(t, pids)
 }
 
 func TestGather_RealFullPatternIntegration(t *testing.T) {
@@ -29,7 +29,7 @@ func TestGather_RealFullPatternIntegration(t *testing.T) {
 	pids, err := pg.FullPattern(`%procstat%`)
 	require.NoError(t, err)
 	fmt.Println(pids)
-	require.Equal(t, true, len(pids) > 0)
+	require.NotEmpty(t, pids)
 }
 
 func TestGather_RealUserIntegration(t *testing.T) {
@@ -43,5 +43,5 @@ func TestGather_RealUserIntegration(t *testing.T) {
 	pids, err := pg.UID(currentUser.Username)
 	require.NoError(t, err)
 	fmt.Println(pids)
-	require.Equal(t, true, len(pids) > 0)
+	require.NotEmpty(t, pids)
 }

plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go

@@ -62,28 +62,28 @@ func TestWinPerformanceQueryImplIntegration(t *testing.T) {
 
 	fcounter, err := query.GetFormattedCounterValueDouble(hCounter)
 	require.NoError(t, err)
-	require.True(t, fcounter > 0)
+	require.Greater(t, fcounter, 0)
 
 	rcounter, err := query.GetRawCounterValue(hCounter)
 	require.NoError(t, err)
-	require.True(t, rcounter > 10000000)
+	require.Greater(t, rcounter, 10000000)
 
 	now := time.Now()
 	mtime, err := query.CollectDataWithTime()
 	require.NoError(t, err)
-	require.True(t, mtime.Sub(now) < time.Second)
+	require.Less(t, mtime.Sub(now), time.Second)
 
 	counterPath = "\\Process(*)\\% Processor Time"
 	paths, err := query.ExpandWildCardPath(counterPath)
 	require.NoError(t, err)
 	require.NotNil(t, paths)
-	require.True(t, len(paths) > 1)
+	require.Greater(t, len(paths), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6
 
 	counterPath = "\\Process(_Total)\\*"
 	paths, err = query.ExpandWildCardPath(counterPath)
 	require.NoError(t, err)
 	require.NotNil(t, paths)
-	require.True(t, len(paths) > 1)
+	require.Greater(t, len(paths), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6
 
 	require.NoError(t, query.Open())
 
@@ -104,11 +104,11 @@ func TestWinPerformanceQueryImplIntegration(t *testing.T) {
 		farr, err = query.GetFormattedCounterArrayDouble(hCounter)
 	}
 	require.NoError(t, err)
-	require.True(t, len(farr) > 0)
+	require.NotEmpty(t, farr)
 
 	rarr, err := query.GetRawCounterArray(hCounter)
 	require.NoError(t, err)
-	require.True(t, len(rarr) > 0, "Too")
+	require.NotEmpty(t, rarr, "Too")
 
 	require.NoError(t, query.Close())
 }
@@ -559,15 +559,15 @@ func TestWinPerfCountersCollectRawIntegration(t *testing.T) {
 
 	time.Sleep(2000 * time.Millisecond)
 	require.NoError(t, m.Gather(&acc))
-	require.True(t, len(acc.Metrics) > 1)
+	require.Greater(t, len(acc.Metrics), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6
 
 	expectedCounter := "Percent_Idle_Time_Raw"
 	for _, metric := range acc.Metrics {
 		val, ok := metric.Fields[expectedCounter]
 		require.True(t, ok, "Expected presence of %s field", expectedCounter)
 		valInt64, ok := val.(int64)
 		require.True(t, ok, fmt.Sprintf("Expected int64, got %T", val))
-		require.True(t, valInt64 > 0, fmt.Sprintf("Expected > 0, got %d, for %#v", valInt64, metric))
+		require.Greater(t, valInt64, 0, fmt.Sprintf("Expected > 0, got %d, for %#v", valInt64, metric))
 	}
 
 	// Test *Array way
@@ -583,13 +583,13 @@ func TestWinPerfCountersCollectRawIntegration(t *testing.T) {
 
 	time.Sleep(2000 * time.Millisecond)
 	require.NoError(t, m.Gather(&acc2))
-	require.True(t, len(acc2.Metrics) > 1)
+	require.Greater(t, len(acc2.Metrics), 1) //nolint:testifylint // https://github.com/Antonboom/testifylint/issues/6
 
 	for _, metric := range acc2.Metrics {
 		val, ok := metric.Fields[expectedCounter]
 		require.True(t, ok, "Expected presence of %s field", expectedCounter)
 		valInt64, ok := val.(int64)
 		require.True(t, ok, fmt.Sprintf("Expected int64, got %T", val))
-		require.True(t, valInt64 > 0, fmt.Sprintf("Expected > 0, got %d, for %#v", valInt64, metric))
+		require.Greater(t, valInt64, 0, fmt.Sprintf("Expected > 0, got %d, for %#v", valInt64, metric))
 	}
 }