diff --git a/.golangci.yml b/.golangci.yml index 254429649..4ccc72966 100644 --- a/.golangci.yml +++ b/.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 diff --git a/cmd/telegraf/main_win_test.go b/cmd/telegraf/main_win_test.go index 42c71b99a..000d1482e 100644 --- a/cmd/telegraf/main_win_test.go +++ b/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) } diff --git a/plugins/inputs/ping/ping_windows_test.go b/plugins/inputs/ping/ping_windows_test.go index a704d39c7..f53222891 100644 --- a/plugins/inputs/ping/ping_windows_test.go +++ b/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 }, } diff --git a/plugins/inputs/procstat/native_finder_windows_test.go b/plugins/inputs/procstat/native_finder_windows_test.go index 337188921..a3bca60f4 100644 --- a/plugins/inputs/procstat/native_finder_windows_test.go +++ b/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) } diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go index d2804af72..c4de52478 100644 --- a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go +++ b/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,7 +559,7 @@ 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 { @@ -567,7 +567,7 @@ func TestWinPerfCountersCollectRawIntegration(t *testing.T) { 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)) } } diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_test.go index 40593475d..62fef55b0 100644 --- a/plugins/inputs/win_perf_counters/win_perf_counters_test.go +++ b/plugins/inputs/win_perf_counters/win_perf_counters_test.go @@ -347,11 +347,11 @@ func TestAddItemSimple(t *testing.T) { counters, ok := m.hostCounters["localhost"] require.True(t, ok) require.Len(t, counters.counters, 1) - require.True(t, counters.counters[0].computer == "localhost") - require.True(t, counters.counters[0].objectName == "O") - require.True(t, counters.counters[0].instance == "I") - require.True(t, counters.counters[0].counter == "c") - require.True(t, counters.counters[0].measurement == "test") + require.Equal(t, "localhost", counters.counters[0].computer) + require.Equal(t, "O", counters.counters[0].objectName) + require.Equal(t, "I", counters.counters[0].instance) + require.Equal(t, "c", counters.counters[0].counter) + require.Equal(t, "test", counters.counters[0].measurement) require.False(t, counters.counters[0].includeTotal) } @@ -501,161 +501,161 @@ func TestParseConfigMultiComps(t *testing.T) { counters, ok := m.hostCounters["localhost"] require.True(t, ok) require.Len(t, counters.counters, 8) - require.True(t, counters.tag == hostname()) - require.True(t, counters.counters[0].computer == "localhost") - require.True(t, counters.counters[0].objectName == "O") - require.True(t, counters.counters[0].instance == "I") - require.True(t, counters.counters[0].counter == "C") - require.True(t, counters.counters[0].measurement == "m") - require.True(t, !counters.counters[0].includeTotal) - require.True(t, counters.counters[1].computer == "localhost") - require.True(t, counters.counters[1].objectName == "O1") - require.True(t, counters.counters[1].instance == "I1") - require.True(t, counters.counters[1].counter == "C1") - require.True(t, counters.counters[1].measurement == "m") - require.True(t, !counters.counters[1].includeTotal) - require.True(t, counters.counters[2].computer == "localhost") - require.True(t, counters.counters[2].objectName == "O1") - require.True(t, counters.counters[2].instance == "I2") - require.True(t, counters.counters[2].counter == "C1") - require.True(t, counters.counters[2].measurement == "m") - require.True(t, !counters.counters[2].includeTotal) - require.True(t, counters.counters[3].computer == "localhost") - require.True(t, counters.counters[3].objectName == "O1") - require.True(t, counters.counters[3].instance == "I1") - require.True(t, counters.counters[3].counter == "C2") - require.True(t, counters.counters[3].measurement == "m") - require.True(t, !counters.counters[3].includeTotal) - require.True(t, counters.counters[4].computer == "localhost") - require.True(t, counters.counters[4].objectName == "O1") - require.True(t, counters.counters[4].instance == "I2") - require.True(t, counters.counters[4].counter == "C2") - require.True(t, counters.counters[4].measurement == "m") - require.True(t, !counters.counters[4].includeTotal) - require.True(t, counters.counters[5].computer == "localhost") - require.True(t, counters.counters[5].objectName == "O2") - require.True(t, counters.counters[5].instance == "I") - require.True(t, counters.counters[5].counter == "C1") - require.True(t, counters.counters[5].measurement == "m") - require.True(t, !counters.counters[5].includeTotal) - require.True(t, counters.counters[6].computer == "localhost") - require.True(t, counters.counters[6].objectName == "O2") - require.True(t, counters.counters[6].instance == "I") - require.True(t, counters.counters[6].counter == "C2") - require.True(t, counters.counters[6].measurement == "m") - require.True(t, !counters.counters[6].includeTotal) - require.True(t, counters.counters[7].computer == "localhost") - require.True(t, counters.counters[7].objectName == "O2") - require.True(t, counters.counters[7].instance == "I") - require.True(t, counters.counters[7].counter == "C3") - require.True(t, counters.counters[7].measurement == "m") - require.True(t, !counters.counters[7].includeTotal) + require.Equal(t, counters.tag, hostname()) + require.Equal(t, "localhost", counters.counters[0].computer) + require.Equal(t, "O", counters.counters[0].objectName) + require.Equal(t, "I", counters.counters[0].instance) + require.Equal(t, "C", counters.counters[0].counter) + require.Equal(t, "m", counters.counters[0].measurement) + require.False(t, counters.counters[0].includeTotal) + require.Equal(t, "localhost", counters.counters[1].computer) + require.Equal(t, "O1", counters.counters[1].objectName) + require.Equal(t, "I1", counters.counters[1].instance) + require.Equal(t, "C1", counters.counters[1].counter) + require.Equal(t, "m", counters.counters[1].measurement) + require.False(t, counters.counters[1].includeTotal) + require.Equal(t, "localhost", counters.counters[2].computer) + require.Equal(t, "O1", counters.counters[2].objectName) + require.Equal(t, "I2", counters.counters[2].instance) + require.Equal(t, "C1", counters.counters[2].counter) + require.Equal(t, "m", counters.counters[2].measurement) + require.False(t, counters.counters[2].includeTotal) + require.Equal(t, "localhost", counters.counters[3].computer) + require.Equal(t, "O1", counters.counters[3].objectName) + require.Equal(t, "I1", counters.counters[3].instance) + require.Equal(t, "C2", counters.counters[3].counter) + require.Equal(t, "m", counters.counters[3].measurement) + require.False(t, counters.counters[3].includeTotal) + require.Equal(t, "localhost", counters.counters[4].computer) + require.Equal(t, "O1", counters.counters[4].objectName) + require.Equal(t, "I2", counters.counters[4].instance) + require.Equal(t, "C2", counters.counters[4].counter) + require.Equal(t, "m", counters.counters[4].measurement) + require.False(t, counters.counters[4].includeTotal) + require.Equal(t, "localhost", counters.counters[5].computer) + require.Equal(t, "O2", counters.counters[5].objectName) + require.Equal(t, "I", counters.counters[5].instance) + require.Equal(t, "C1", counters.counters[5].counter) + require.Equal(t, "m", counters.counters[5].measurement) + require.False(t, counters.counters[5].includeTotal) + require.Equal(t, "localhost", counters.counters[6].computer) + require.Equal(t, "O2", counters.counters[6].objectName) + require.Equal(t, "I", counters.counters[6].instance) + require.Equal(t, "C2", counters.counters[6].counter) + require.Equal(t, "m", counters.counters[6].measurement) + require.False(t, counters.counters[6].includeTotal) + require.Equal(t, "localhost", counters.counters[7].computer) + require.Equal(t, "O2", counters.counters[7].objectName) + require.Equal(t, "I", counters.counters[7].instance) + require.Equal(t, "C3", counters.counters[7].counter) + require.Equal(t, "m", counters.counters[7].measurement) + require.False(t, counters.counters[7].includeTotal) counters, ok = m.hostCounters["cmp1"] require.True(t, ok) require.Len(t, counters.counters, 8) - require.True(t, counters.tag == "cmp1") - require.True(t, counters.counters[0].computer == "cmp1") - require.True(t, counters.counters[0].objectName == "O") - require.True(t, counters.counters[0].instance == "I") - require.True(t, counters.counters[0].counter == "C") - require.True(t, counters.counters[0].measurement == "m") - require.True(t, !counters.counters[0].includeTotal) - require.True(t, counters.counters[1].computer == "cmp1") - require.True(t, counters.counters[1].objectName == "O1") - require.True(t, counters.counters[1].instance == "I1") - require.True(t, counters.counters[1].counter == "C1") - require.True(t, counters.counters[1].measurement == "m") - require.True(t, !counters.counters[1].includeTotal) - require.True(t, counters.counters[2].computer == "cmp1") - require.True(t, counters.counters[2].objectName == "O1") - require.True(t, counters.counters[2].instance == "I2") - require.True(t, counters.counters[2].counter == "C1") - require.True(t, counters.counters[2].measurement == "m") - require.True(t, !counters.counters[2].includeTotal) - require.True(t, counters.counters[3].computer == "cmp1") - require.True(t, counters.counters[3].objectName == "O1") - require.True(t, counters.counters[3].instance == "I1") - require.True(t, counters.counters[3].counter == "C2") - require.True(t, counters.counters[3].measurement == "m") - require.True(t, !counters.counters[3].includeTotal) - require.True(t, counters.counters[4].computer == "cmp1") - require.True(t, counters.counters[4].objectName == "O1") - require.True(t, counters.counters[4].instance == "I2") - require.True(t, counters.counters[4].counter == "C2") - require.True(t, counters.counters[4].measurement == "m") - require.True(t, !counters.counters[4].includeTotal) - require.True(t, counters.counters[5].computer == "cmp1") - require.True(t, counters.counters[5].objectName == "O2") - require.True(t, counters.counters[5].instance == "I") - require.True(t, counters.counters[5].counter == "C1") - require.True(t, counters.counters[5].measurement == "m") - require.True(t, !counters.counters[5].includeTotal) - require.True(t, counters.counters[6].computer == "cmp1") - require.True(t, counters.counters[6].objectName == "O2") - require.True(t, counters.counters[6].instance == "I") - require.True(t, counters.counters[6].counter == "C2") - require.True(t, counters.counters[6].measurement == "m") - require.True(t, !counters.counters[6].includeTotal) - require.True(t, counters.counters[7].computer == "cmp1") - require.True(t, counters.counters[7].objectName == "O2") - require.True(t, counters.counters[7].instance == "I") - require.True(t, counters.counters[7].counter == "C3") - require.True(t, counters.counters[7].measurement == "m") - require.True(t, !counters.counters[7].includeTotal) + require.Equal(t, "cmp1", counters.tag) + require.Equal(t, "cmp1", counters.counters[0].computer) + require.Equal(t, "O", counters.counters[0].objectName) + require.Equal(t, "I", counters.counters[0].instance) + require.Equal(t, "C", counters.counters[0].counter) + require.Equal(t, "m", counters.counters[0].measurement) + require.False(t, counters.counters[0].includeTotal) + require.Equal(t, "cmp1", counters.counters[1].computer) + require.Equal(t, "O1", counters.counters[1].objectName) + require.Equal(t, "I1", counters.counters[1].instance) + require.Equal(t, "C1", counters.counters[1].counter) + require.Equal(t, "m", counters.counters[1].measurement) + require.False(t, counters.counters[1].includeTotal) + require.Equal(t, "cmp1", counters.counters[2].computer) + require.Equal(t, "O1", counters.counters[2].objectName) + require.Equal(t, "I2", counters.counters[2].instance) + require.Equal(t, "C1", counters.counters[2].counter) + require.Equal(t, "m", counters.counters[2].measurement) + require.False(t, counters.counters[2].includeTotal) + require.Equal(t, "cmp1", counters.counters[3].computer) + require.Equal(t, "O1", counters.counters[3].objectName) + require.Equal(t, "I1", counters.counters[3].instance) + require.Equal(t, "C2", counters.counters[3].counter) + require.Equal(t, "m", counters.counters[3].measurement) + require.False(t, counters.counters[3].includeTotal) + require.Equal(t, "cmp1", counters.counters[4].computer) + require.Equal(t, "O1", counters.counters[4].objectName) + require.Equal(t, "I2", counters.counters[4].instance) + require.Equal(t, "C2", counters.counters[4].counter) + require.Equal(t, "m", counters.counters[4].measurement) + require.False(t, counters.counters[4].includeTotal) + require.Equal(t, "cmp1", counters.counters[5].computer) + require.Equal(t, "O2", counters.counters[5].objectName) + require.Equal(t, "I", counters.counters[5].instance) + require.Equal(t, "C1", counters.counters[5].counter) + require.Equal(t, "m", counters.counters[5].measurement) + require.False(t, counters.counters[5].includeTotal) + require.Equal(t, "cmp1", counters.counters[6].computer) + require.Equal(t, "O2", counters.counters[6].objectName) + require.Equal(t, "I", counters.counters[6].instance) + require.Equal(t, "C2", counters.counters[6].counter) + require.Equal(t, "m", counters.counters[6].measurement) + require.False(t, counters.counters[6].includeTotal) + require.Equal(t, "cmp1", counters.counters[7].computer) + require.Equal(t, "O2", counters.counters[7].objectName) + require.Equal(t, "I", counters.counters[7].instance) + require.Equal(t, "C3", counters.counters[7].counter) + require.Equal(t, "m", counters.counters[7].measurement) + require.False(t, counters.counters[7].includeTotal) counters, ok = m.hostCounters["cmp2"] require.True(t, ok) require.Len(t, counters.counters, 8) - require.True(t, counters.tag == "cmp2") - require.True(t, counters.counters[0].computer == "cmp2") - require.True(t, counters.counters[0].objectName == "O") - require.True(t, counters.counters[0].instance == "I") - require.True(t, counters.counters[0].counter == "C") - require.True(t, counters.counters[0].measurement == "m") - require.True(t, !counters.counters[0].includeTotal) - require.True(t, counters.counters[1].computer == "cmp2") - require.True(t, counters.counters[1].objectName == "O1") - require.True(t, counters.counters[1].instance == "I1") - require.True(t, counters.counters[1].counter == "C1") - require.True(t, counters.counters[1].measurement == "m") - require.True(t, !counters.counters[1].includeTotal) - require.True(t, counters.counters[2].computer == "cmp2") - require.True(t, counters.counters[2].objectName == "O1") - require.True(t, counters.counters[2].instance == "I2") - require.True(t, counters.counters[2].counter == "C1") - require.True(t, counters.counters[2].measurement == "m") - require.True(t, !counters.counters[2].includeTotal) - require.True(t, counters.counters[3].computer == "cmp2") - require.True(t, counters.counters[3].objectName == "O1") - require.True(t, counters.counters[3].instance == "I1") - require.True(t, counters.counters[3].counter == "C2") - require.True(t, counters.counters[3].measurement == "m") - require.True(t, !counters.counters[3].includeTotal) - require.True(t, counters.counters[4].computer == "cmp2") - require.True(t, counters.counters[4].objectName == "O1") - require.True(t, counters.counters[4].instance == "I2") - require.True(t, counters.counters[4].counter == "C2") - require.True(t, counters.counters[4].measurement == "m") - require.True(t, !counters.counters[4].includeTotal) - require.True(t, counters.counters[5].computer == "cmp2") - require.True(t, counters.counters[5].objectName == "O2") - require.True(t, counters.counters[5].instance == "I") - require.True(t, counters.counters[5].counter == "C1") - require.True(t, counters.counters[5].measurement == "m") - require.True(t, !counters.counters[5].includeTotal) - require.True(t, counters.counters[6].computer == "cmp2") - require.True(t, counters.counters[6].objectName == "O2") - require.True(t, counters.counters[6].instance == "I") - require.True(t, counters.counters[6].counter == "C2") - require.True(t, counters.counters[6].measurement == "m") - require.True(t, !counters.counters[6].includeTotal) - require.True(t, counters.counters[7].computer == "cmp2") - require.True(t, counters.counters[7].objectName == "O2") - require.True(t, counters.counters[7].instance == "I") - require.True(t, counters.counters[7].counter == "C3") - require.True(t, counters.counters[7].measurement == "m") - require.True(t, !counters.counters[7].includeTotal) + require.Equal(t, "cmp2", counters.tag) + require.Equal(t, "cmp2", counters.counters[0].computer) + require.Equal(t, "O", counters.counters[0].objectName) + require.Equal(t, "I", counters.counters[0].instance) + require.Equal(t, "C", counters.counters[0].counter) + require.Equal(t, "m", counters.counters[0].measurement) + require.False(t, counters.counters[0].includeTotal) + require.Equal(t, "cmp2", counters.counters[1].computer) + require.Equal(t, "O1", counters.counters[1].objectName) + require.Equal(t, "I1", counters.counters[1].instance) + require.Equal(t, "C1", counters.counters[1].counter) + require.Equal(t, "m", counters.counters[1].measurement) + require.False(t, counters.counters[1].includeTotal) + require.Equal(t, "cmp2", counters.counters[2].computer) + require.Equal(t, "O1", counters.counters[2].objectName) + require.Equal(t, "I2", counters.counters[2].instance) + require.Equal(t, "C1", counters.counters[2].counter) + require.Equal(t, "m", counters.counters[2].measurement) + require.False(t, counters.counters[2].includeTotal) + require.Equal(t, "cmp2", counters.counters[3].computer) + require.Equal(t, "O1", counters.counters[3].objectName) + require.Equal(t, "I1", counters.counters[3].instance) + require.Equal(t, "C2", counters.counters[3].counter) + require.Equal(t, "m", counters.counters[3].measurement) + require.False(t, counters.counters[3].includeTotal) + require.Equal(t, "cmp2", counters.counters[4].computer) + require.Equal(t, "O1", counters.counters[4].objectName) + require.Equal(t, "I2", counters.counters[4].instance) + require.Equal(t, "C2", counters.counters[4].counter) + require.Equal(t, "m", counters.counters[4].measurement) + require.False(t, counters.counters[4].includeTotal) + require.Equal(t, "cmp2", counters.counters[5].computer) + require.Equal(t, "O2", counters.counters[5].objectName) + require.Equal(t, "I", counters.counters[5].instance) + require.Equal(t, "C1", counters.counters[5].counter) + require.Equal(t, "m", counters.counters[5].measurement) + require.False(t, counters.counters[5].includeTotal) + require.Equal(t, "cmp2", counters.counters[6].computer) + require.Equal(t, "O2", counters.counters[6].objectName) + require.Equal(t, "I", counters.counters[6].instance) + require.Equal(t, "C2", counters.counters[6].counter) + require.Equal(t, "m", counters.counters[6].measurement) + require.False(t, counters.counters[6].includeTotal) + require.Equal(t, "cmp2", counters.counters[7].computer) + require.Equal(t, "O2", counters.counters[7].objectName) + require.Equal(t, "I", counters.counters[7].instance) + require.Equal(t, "C3", counters.counters[7].counter) + require.Equal(t, "m", counters.counters[7].measurement) + require.False(t, counters.counters[7].includeTotal) } func TestParseConfigMultiCompsOverrideMultiplePerfObjects(t *testing.T) { @@ -720,86 +720,86 @@ func TestParseConfigMultiCompsOverrideMultiplePerfObjects(t *testing.T) { counters, ok := m.hostCounters["localhost"] require.True(t, ok) require.Len(t, counters.counters, 4) - require.True(t, counters.counters[0].computer == "localhost") - require.True(t, counters.counters[0].objectName == "O") - require.True(t, counters.counters[0].instance == "I1") - require.True(t, counters.counters[0].counter == "C1") - require.True(t, counters.counters[0].measurement == "m") - require.True(t, !counters.counters[0].includeTotal) - require.True(t, counters.counters[1].computer == "localhost") - require.True(t, counters.counters[1].objectName == "O") - require.True(t, counters.counters[1].instance == "I2") - require.True(t, counters.counters[1].counter == "C1") - require.True(t, counters.counters[1].measurement == "m") - require.True(t, !counters.counters[1].includeTotal) - require.True(t, counters.counters[2].computer == "localhost") - require.True(t, counters.counters[2].objectName == "O") - require.True(t, counters.counters[2].instance == "I1") - require.True(t, counters.counters[2].counter == "C2") - require.True(t, counters.counters[2].measurement == "m") - require.True(t, !counters.counters[2].includeTotal) - require.True(t, counters.counters[3].computer == "localhost") - require.True(t, counters.counters[3].objectName == "O") - require.True(t, counters.counters[3].instance == "I2") - require.True(t, counters.counters[3].counter == "C2") - require.True(t, counters.counters[3].measurement == "m") - require.True(t, !counters.counters[3].includeTotal) + require.Equal(t, "localhost", counters.counters[0].computer) + require.Equal(t, "O", counters.counters[0].objectName) + require.Equal(t, "I1", counters.counters[0].instance) + require.Equal(t, "C1", counters.counters[0].counter) + require.Equal(t, "m", counters.counters[0].measurement) + require.False(t, counters.counters[0].includeTotal) + require.Equal(t, "localhost", counters.counters[1].computer) + require.Equal(t, "O", counters.counters[1].objectName) + require.Equal(t, "I2", counters.counters[1].instance) + require.Equal(t, "C1", counters.counters[1].counter) + require.Equal(t, "m", counters.counters[1].measurement) + require.False(t, counters.counters[1].includeTotal) + require.Equal(t, "localhost", counters.counters[2].computer) + require.Equal(t, "O", counters.counters[2].objectName) + require.Equal(t, "I1", counters.counters[2].instance) + require.Equal(t, "C2", counters.counters[2].counter) + require.Equal(t, "m", counters.counters[2].measurement) + require.False(t, counters.counters[2].includeTotal) + require.Equal(t, "localhost", counters.counters[3].computer) + require.Equal(t, "O", counters.counters[3].objectName) + require.Equal(t, "I2", counters.counters[3].instance) + require.Equal(t, "C2", counters.counters[3].counter) + require.Equal(t, "m", counters.counters[3].measurement) + require.False(t, counters.counters[3].includeTotal) counters, ok = m.hostCounters["cmp1"] require.True(t, ok) require.Len(t, counters.counters, 4) - require.True(t, counters.counters[0].computer == "cmp1") - require.True(t, counters.counters[0].objectName == "O1") - require.True(t, counters.counters[0].instance == "I1") - require.True(t, counters.counters[0].counter == "C1") - require.True(t, counters.counters[0].measurement == "m") - require.True(t, !counters.counters[0].includeTotal) - require.True(t, counters.counters[1].computer == "cmp1") - require.True(t, counters.counters[1].objectName == "O1") - require.True(t, counters.counters[1].instance == "I2") - require.True(t, counters.counters[1].counter == "C1") - require.True(t, counters.counters[1].measurement == "m") - require.True(t, !counters.counters[1].includeTotal) - require.True(t, counters.counters[2].computer == "cmp1") - require.True(t, counters.counters[2].objectName == "O1") - require.True(t, counters.counters[2].instance == "I1") - require.True(t, counters.counters[2].counter == "C2") - require.True(t, counters.counters[2].measurement == "m") - require.True(t, !counters.counters[2].includeTotal) - require.True(t, counters.counters[3].computer == "cmp1") - require.True(t, counters.counters[3].objectName == "O1") - require.True(t, counters.counters[3].instance == "I2") - require.True(t, counters.counters[3].counter == "C2") - require.True(t, counters.counters[3].measurement == "m") - require.True(t, !counters.counters[3].includeTotal) + require.Equal(t, "cmp1", counters.counters[0].computer) + require.Equal(t, "O1", counters.counters[0].objectName) + require.Equal(t, "I1", counters.counters[0].instance) + require.Equal(t, "C1", counters.counters[0].counter) + require.Equal(t, "m", counters.counters[0].measurement) + require.False(t, counters.counters[0].includeTotal) + require.Equal(t, "cmp1", counters.counters[1].computer) + require.Equal(t, "O1", counters.counters[1].objectName) + require.Equal(t, "I2", counters.counters[1].instance) + require.Equal(t, "C1", counters.counters[1].counter) + require.Equal(t, "m", counters.counters[1].measurement) + require.False(t, counters.counters[1].includeTotal) + require.Equal(t, "cmp1", counters.counters[2].computer) + require.Equal(t, "O1", counters.counters[2].objectName) + require.Equal(t, "I1", counters.counters[2].instance) + require.Equal(t, "C2", counters.counters[2].counter) + require.Equal(t, "m", counters.counters[2].measurement) + require.False(t, counters.counters[2].includeTotal) + require.Equal(t, "cmp1", counters.counters[3].computer) + require.Equal(t, "O1", counters.counters[3].objectName) + require.Equal(t, "I2", counters.counters[3].instance) + require.Equal(t, "C2", counters.counters[3].counter) + require.Equal(t, "m", counters.counters[3].measurement) + require.False(t, counters.counters[3].includeTotal) counters, ok = m.hostCounters["cmp2"] require.True(t, ok) require.Len(t, counters.counters, 4) - require.True(t, counters.counters[0].computer == "cmp2") - require.True(t, counters.counters[0].objectName == "O2") - require.True(t, counters.counters[0].instance == "I1") - require.True(t, counters.counters[0].counter == "C1") - require.True(t, counters.counters[0].measurement == "m") - require.True(t, !counters.counters[0].includeTotal) - require.True(t, counters.counters[1].computer == "cmp2") - require.True(t, counters.counters[1].objectName == "O2") - require.True(t, counters.counters[1].instance == "I2") - require.True(t, counters.counters[1].counter == "C1") - require.True(t, counters.counters[1].measurement == "m") - require.True(t, !counters.counters[1].includeTotal) - require.True(t, counters.counters[2].computer == "cmp2") - require.True(t, counters.counters[2].objectName == "O2") - require.True(t, counters.counters[2].instance == "I1") - require.True(t, counters.counters[2].counter == "C2") - require.True(t, counters.counters[2].measurement == "m") - require.True(t, !counters.counters[2].includeTotal) - require.True(t, counters.counters[3].computer == "cmp2") - require.True(t, counters.counters[3].objectName == "O2") - require.True(t, counters.counters[3].instance == "I2") - require.True(t, counters.counters[3].counter == "C2") - require.True(t, counters.counters[3].measurement == "m") - require.True(t, !counters.counters[3].includeTotal) + require.Equal(t, "cmp2", counters.counters[0].computer) + require.Equal(t, "O2", counters.counters[0].objectName) + require.Equal(t, "I1", counters.counters[0].instance) + require.Equal(t, "C1", counters.counters[0].counter) + require.Equal(t, "m", counters.counters[0].measurement) + require.False(t, counters.counters[0].includeTotal) + require.Equal(t, "cmp2", counters.counters[1].computer) + require.Equal(t, "O2", counters.counters[1].objectName) + require.Equal(t, "I2", counters.counters[1].instance) + require.Equal(t, "C1", counters.counters[1].counter) + require.Equal(t, "m", counters.counters[1].measurement) + require.False(t, counters.counters[1].includeTotal) + require.Equal(t, "cmp2", counters.counters[2].computer) + require.Equal(t, "O2", counters.counters[2].objectName) + require.Equal(t, "I1", counters.counters[2].instance) + require.Equal(t, "C2", counters.counters[2].counter) + require.Equal(t, "m", counters.counters[2].measurement) + require.False(t, counters.counters[2].includeTotal) + require.Equal(t, "cmp2", counters.counters[3].computer) + require.Equal(t, "O2", counters.counters[3].objectName) + require.Equal(t, "I2", counters.counters[3].instance) + require.Equal(t, "C2", counters.counters[3].counter) + require.Equal(t, "m", counters.counters[3].measurement) + require.False(t, counters.counters[3].includeTotal) } func TestParseConfigMultiCompsOverrideOnePerfObject(t *testing.T) { @@ -871,77 +871,77 @@ func TestParseConfigMultiCompsOverrideOnePerfObject(t *testing.T) { counters, ok := m.hostCounters["localhost"] require.True(t, ok) require.Len(t, counters.counters, 1) - require.True(t, counters.tag == hostname()) - require.True(t, counters.counters[0].computer == "localhost") - require.True(t, counters.counters[0].objectName == "O1") - require.True(t, counters.counters[0].instance == "I") - require.True(t, counters.counters[0].counter == "C") - require.True(t, counters.counters[0].measurement == "m") - require.True(t, !counters.counters[0].includeTotal) + require.Equal(t, counters.tag, hostname()) + require.Equal(t, "localhost", counters.counters[0].computer) + require.Equal(t, "O1", counters.counters[0].objectName) + require.Equal(t, "I", counters.counters[0].instance) + require.Equal(t, "C", counters.counters[0].counter) + require.Equal(t, "m", counters.counters[0].measurement) + require.False(t, counters.counters[0].includeTotal) counters, ok = m.hostCounters["cmp1"] require.True(t, ok) require.Len(t, counters.counters, 5) - require.True(t, counters.tag == "cmp1") - require.True(t, counters.counters[0].computer == "cmp1") - require.True(t, counters.counters[0].objectName == "O") - require.True(t, counters.counters[0].instance == "I1") - require.True(t, counters.counters[0].counter == "C1") - require.True(t, counters.counters[0].measurement == "m") - require.True(t, !counters.counters[0].includeTotal) - require.True(t, counters.counters[0].computer == "cmp1") - require.True(t, counters.counters[1].objectName == "O") - require.True(t, counters.counters[1].instance == "I2") - require.True(t, counters.counters[1].counter == "C1") - require.True(t, counters.counters[1].measurement == "m") - require.True(t, !counters.counters[1].includeTotal) - require.True(t, counters.counters[2].computer == "cmp1") - require.True(t, counters.counters[2].objectName == "O") - require.True(t, counters.counters[2].instance == "I1") - require.True(t, counters.counters[2].counter == "C2") - require.True(t, counters.counters[2].measurement == "m") - require.True(t, !counters.counters[2].includeTotal) - require.True(t, counters.counters[3].computer == "cmp1") - require.True(t, counters.counters[3].objectName == "O") - require.True(t, counters.counters[3].instance == "I2") - require.True(t, counters.counters[3].counter == "C2") - require.True(t, counters.counters[3].measurement == "m") - require.True(t, !counters.counters[3].includeTotal) - require.True(t, counters.counters[4].computer == "cmp1") - require.True(t, counters.counters[4].objectName == "O1") - require.True(t, counters.counters[4].instance == "I") - require.True(t, counters.counters[4].counter == "C") - require.True(t, counters.counters[4].measurement == "m") - require.True(t, !counters.counters[4].includeTotal) + require.Equal(t, "cmp1", counters.tag) + require.Equal(t, "cmp1", counters.counters[0].computer) + require.Equal(t, "O", counters.counters[0].objectName) + require.Equal(t, "I1", counters.counters[0].instance) + require.Equal(t, "C1", counters.counters[0].counter) + require.Equal(t, "m", counters.counters[0].measurement) + require.False(t, counters.counters[0].includeTotal) + require.Equal(t, "cmp1", counters.counters[0].computer) + require.Equal(t, "O", counters.counters[1].objectName) + require.Equal(t, "I2", counters.counters[1].instance) + require.Equal(t, "C1", counters.counters[1].counter) + require.Equal(t, "m", counters.counters[1].measurement) + require.False(t, counters.counters[1].includeTotal) + require.Equal(t, "cmp1", counters.counters[2].computer) + require.Equal(t, "O", counters.counters[2].objectName) + require.Equal(t, "I1", counters.counters[2].instance) + require.Equal(t, "C2", counters.counters[2].counter) + require.Equal(t, "m", counters.counters[2].measurement) + require.False(t, counters.counters[2].includeTotal) + require.Equal(t, "cmp1", counters.counters[3].computer) + require.Equal(t, "O", counters.counters[3].objectName) + require.Equal(t, "I2", counters.counters[3].instance) + require.Equal(t, "C2", counters.counters[3].counter) + require.Equal(t, "m", counters.counters[3].measurement) + require.False(t, counters.counters[3].includeTotal) + require.Equal(t, "cmp1", counters.counters[4].computer) + require.Equal(t, "O1", counters.counters[4].objectName) + require.Equal(t, "I", counters.counters[4].instance) + require.Equal(t, "C", counters.counters[4].counter) + require.Equal(t, "m", counters.counters[4].measurement) + require.False(t, counters.counters[4].includeTotal) counters, ok = m.hostCounters["cmp2"] require.True(t, ok) require.Len(t, counters.counters, 4) - require.True(t, counters.tag == "cmp2") - require.True(t, counters.counters[0].computer == "cmp2") - require.True(t, counters.counters[0].objectName == "O") - require.True(t, counters.counters[0].instance == "I1") - require.True(t, counters.counters[0].counter == "C1") - require.True(t, counters.counters[0].measurement == "m") - require.True(t, !counters.counters[0].includeTotal) - require.True(t, counters.counters[1].computer == "cmp2") - require.True(t, counters.counters[1].objectName == "O") - require.True(t, counters.counters[1].instance == "I2") - require.True(t, counters.counters[1].counter == "C1") - require.True(t, counters.counters[1].measurement == "m") - require.True(t, !counters.counters[1].includeTotal) - require.True(t, counters.counters[2].computer == "cmp2") - require.True(t, counters.counters[2].objectName == "O") - require.True(t, counters.counters[2].instance == "I1") - require.True(t, counters.counters[2].counter == "C2") - require.True(t, counters.counters[2].measurement == "m") - require.True(t, !counters.counters[2].includeTotal) - require.True(t, counters.counters[3].computer == "cmp2") - require.True(t, counters.counters[3].objectName == "O") - require.True(t, counters.counters[3].instance == "I2") - require.True(t, counters.counters[3].counter == "C2") - require.True(t, counters.counters[3].measurement == "m") - require.True(t, !counters.counters[3].includeTotal) + require.Equal(t, "cmp2", counters.tag) + require.Equal(t, "cmp2", counters.counters[0].computer) + require.Equal(t, "O", counters.counters[0].objectName) + require.Equal(t, "I1", counters.counters[0].instance) + require.Equal(t, "C1", counters.counters[0].counter) + require.Equal(t, "m", counters.counters[0].measurement) + require.False(t, counters.counters[0].includeTotal) + require.Equal(t, "cmp2", counters.counters[1].computer) + require.Equal(t, "O", counters.counters[1].objectName) + require.Equal(t, "I2", counters.counters[1].instance) + require.Equal(t, "C1", counters.counters[1].counter) + require.Equal(t, "m", counters.counters[1].measurement) + require.False(t, counters.counters[1].includeTotal) + require.Equal(t, "cmp2", counters.counters[2].computer) + require.Equal(t, "O", counters.counters[2].objectName) + require.Equal(t, "I1", counters.counters[2].instance) + require.Equal(t, "C2", counters.counters[2].counter) + require.Equal(t, "m", counters.counters[2].measurement) + require.False(t, counters.counters[2].includeTotal) + require.Equal(t, "cmp2", counters.counters[3].computer) + require.Equal(t, "O", counters.counters[3].objectName) + require.Equal(t, "I2", counters.counters[3].instance) + require.Equal(t, "C2", counters.counters[3].counter) + require.Equal(t, "m", counters.counters[3].measurement) + require.False(t, counters.counters[3].includeTotal) } func TestParseConfigLocalhost(t *testing.T) {