CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(linters): Fix findings found by testifylint: bool-compare (#14163)

This commit is contained in:
Paweł Żak 2023-10-24 18:45:17 +02:00 committed by GitHub
parent 06083bf19b
commit 990ffc7222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 374 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/telegraf/main_test.go
View File

@ -526,10 +526,10 @@ func TestGlobablBoolFlags(t *testing.T) {
err := runApp(args, buf, NewMockServer(), NewMockConfig(buf), m)
require.NoError(t, err)
require.Equal(t, true, m.debug)
require.Equal(t, true, m.test)
require.Equal(t, true, m.once)
require.Equal(t, true, m.quiet)
require.True(t, m.debug)
require.True(t, m.test)
require.True(t, m.once)
require.True(t, m.quiet)
}
func TestFlagsAreSet(t *testing.T) {
@ -557,10 +557,10 @@ func TestFlagsAreSet(t *testing.T) {
require.Equal(t, []string{expectedString}, m.config)
require.Equal(t, []string{expectedString}, m.configDir)
require.Equal(t, true, m.debug)
require.Equal(t, true, m.test)
require.Equal(t, true, m.once)
require.Equal(t, true, m.quiet)
require.True(t, m.debug)
require.True(t, m.test)
require.True(t, m.once)
require.True(t, m.quiet)
require.Equal(t, expectedInt, m.testWait)
require.Equal(t, expectedString, m.watchConfig)
require.Equal(t, expectedString, m.pidFile)

2
config/types_test.go
View File

@ -30,7 +30,7 @@ func TestConfigDuration(t *testing.T) {
require.EqualValues(t, p.CacheTTL, 3*time.Hour)
require.EqualValues(t, p.LookupTimeout, 17*time.Second)
require.Equal(t, p.MaxParallelLookups, 13)
require.Equal(t, p.Ordered, true)
require.True(t, p.Ordered)
}
func TestDuration(t *testing.T) {

5
plugins/common/opcua/client_test.go
View File

@ -1,9 +1,10 @@
package opcua
import (
"testing"
"github.com/gopcua/opcua/ua"
"github.com/stretchr/testify/require"
"testing"
)
func TestSetupWorkarounds(t *testing.T) {
@ -28,5 +29,5 @@ func TestSetupWorkarounds(t *testing.T) {
func TestCheckStatusCode(t *testing.T) {
var o OpcUAClient
o.codes = []ua.StatusCode{ua.StatusCode(0), ua.StatusCode(192), ua.StatusCode(11141120)}
require.Equal(t, o.StatusCodeOK(ua.StatusCode(192)), true)
require.True(t, o.StatusCodeOK(ua.StatusCode(192)))
}

4
plugins/inputs/aerospike/aerospike_test.go
View File

@ -452,7 +452,9 @@ func TestAerospikeParseValue(t *testing.T) {
require.Equal(t, uint64(18446744041841121751), val)
val = parseAerospikeValue("", "true")
require.Equal(t, true, val)
v, ok := val.(bool)
require.Truef(t, ok, "bool type expected, got '%T' with '%v' value instead", val, val)
require.True(t, v)
// int values
val = parseAerospikeValue("", "42")

6
plugins/inputs/burrow/burrow_test.go
View File

@ -88,7 +88,7 @@ func TestBurrowTopic(t *testing.T) {
}
require.Empty(t, acc.Errors)
require.Equal(t, true, acc.HasMeasurement("burrow_topic"))
require.True(t, acc.HasMeasurement("burrow_topic"))
for i := 0; i < len(fields); i++ {
acc.AssertContainsTaggedFields(t, "burrow_topic", fields[i], tags[i])
}
@ -135,7 +135,7 @@ func TestBurrowPartition(t *testing.T) {
}
require.Empty(t, acc.Errors)
require.Equal(t, true, acc.HasMeasurement("burrow_partition"))
require.True(t, acc.HasMeasurement("burrow_partition"))
for i := 0; i < len(fields); i++ {
acc.AssertContainsTaggedFields(t, "burrow_partition", fields[i], tags[i])
@ -170,7 +170,7 @@ func TestBurrowGroup(t *testing.T) {
}
require.Empty(t, acc.Errors)
require.Equal(t, true, acc.HasMeasurement("burrow_group"))
require.True(t, acc.HasMeasurement("burrow_group"))
for i := 0; i < len(fields); i++ {
acc.AssertContainsTaggedFields(t, "burrow_group", fields[i], tags[i])

5
plugins/inputs/couchbase/couchbase_test.go
View File

@ -210,7 +210,10 @@ func TestGatherFailover(t *testing.T) {
require.NotNil(t, metric)
require.Equal(t, 1, metric.Fields["count"])
require.Equal(t, true, metric.Fields["enabled"])
v, ok := metric.Fields["enabled"].(bool)
require.Truef(t, ok, "bool type expected, got '%T' with '%v' value instead", metric.Fields["enabled"], metric.Fields["enabled"])
require.True(t, v)
require.Equal(t, 2, metric.Fields["max_count"])
require.Equal(t, 72, metric.Fields["timeout"])
}

2
plugins/inputs/filecount/filesystem_helpers_test.go
View File

@ -46,7 +46,7 @@ func TestRealFS(t *testing.T) {
//the following file exists on disk - and not in our fake fs
fileInfo, err := fs.Stat(getTestdataDir() + "/qux")
require.NoError(t, err)
require.Equal(t, false, fileInfo.IsDir())
require.False(t, fileInfo.IsDir())
require.Equal(t, int64(446), fileInfo.Size())
// now swap out real, for fake filesystem

5
plugins/inputs/github/github_test.go
View File

@ -2,7 +2,6 @@ package github
import (
"net/http"
"reflect"
"testing"
gh "github.com/google/go-github/v32/github"
@ -103,7 +102,7 @@ func TestGetTags(t *testing.T) {
"license": licenseName,
}
require.Equal(t, true, reflect.DeepEqual(getTagsReturn, correctTagsReturn))
require.Equal(t, getTagsReturn, correctTagsReturn)
}
func TestGetFields(t *testing.T) {
@ -136,5 +135,5 @@ func TestGetFields(t *testing.T) {
correctFieldReturn["subscribers"] = 5
correctFieldReturn["watchers"] = 6
require.Equal(t, true, reflect.DeepEqual(getFieldsReturn, correctFieldReturn))
require.Equal(t, getFieldsReturn, correctFieldReturn)
}

2
plugins/inputs/google_cloud_storage/google_cloud_storage_test.go
View File

@ -170,7 +170,7 @@ func TestRunGatherIterationWithPages(t *testing.T) {
require.NoError(t, gcs.Gather(acc))
require.Equal(t, 4, len(acc.Metrics))
require.Equal(t, true, gcs.offSet.isPresent())
require.True(t, gcs.offSet.isPresent())
require.Equal(t, "prefix/1604148850994", gcs.offSet.OffSet)
emptyAcc := &testutil.Accumulator{}

4
plugins/inputs/intel_powerstat/intel_powerstat_test.go
View File

@ -81,8 +81,8 @@ func TestParseCPUMetricsConfig(t *testing.T) {
power.CPUMetrics = []string{"cpu_c6_state_residency", "#@$sdkjdfsdf3@", "1pu_c1_state_residency"}
power.parseCPUMetricsConfig()
require.Equal(t, false, power.cpuC1StateResidency)
require.Equal(t, true, power.cpuC6StateResidency)
require.False(t, power.cpuC1StateResidency)
require.True(t, power.cpuC6StateResidency)
disableCoreMetrics(power)
verifyCoreMetrics(t, power, false)

12
plugins/inputs/knx_listener/knx_listener_test.go
View File

@ -134,8 +134,8 @@ func TestRegularReceives_DPT(t *testing.T) {
case float64:
require.InDelta(t, v, m.Fields["value"], epsilon)
}
require.True(t, !tstop.Before(m.Time))
require.True(t, !tstart.After(m.Time))
require.False(t, tstop.Before(m.Time))
require.False(t, tstart.After(m.Time))
}
}
@ -179,10 +179,14 @@ func TestRegularReceives_MultipleMessages(t *testing.T) {
require.Equal(t, "temperature", acc.Metrics[0].Measurement)
require.Equal(t, "1/1/1", acc.Metrics[0].Tags["groupaddress"])
require.Len(t, acc.Metrics[0].Fields, 1)
require.Equal(t, true, acc.Metrics[0].Fields["value"])
v, ok := acc.Metrics[0].Fields["value"].(bool)
require.Truef(t, ok, "bool type expected, got '%T' with '%v' value instead", acc.Metrics[0].Fields["value"], acc.Metrics[0].Fields["value"])
require.True(t, v)
require.Equal(t, "temperature", acc.Metrics[1].Measurement)
require.Equal(t, "1/1/1", acc.Metrics[1].Tags["groupaddress"])
require.Len(t, acc.Metrics[1].Fields, 1)
require.Equal(t, false, acc.Metrics[1].Fields["value"])
v, ok = acc.Metrics[1].Fields["value"].(bool)
require.Truef(t, ok, "bool type expected, got '%T' with '%v' value instead", acc.Metrics[1].Fields["value"], acc.Metrics[1].Fields["value"])
require.False(t, v)
}

9
plugins/inputs/ping/ping_test.go
View File

@ -5,7 +5,6 @@ package ping
import (
"errors"
"fmt"
"reflect"
"sort"
"testing"
"time"
@ -177,8 +176,7 @@ func TestArgs(t *testing.T) {
expected := systemCases[i].output
sort.Strings(actual)
sort.Strings(expected)
require.True(t, reflect.DeepEqual(expected, actual),
"Expected: %s Actual: %s", expected, actual)
require.Equal(t, expected, actual)
}
}
@ -206,8 +204,7 @@ func TestArgs6(t *testing.T) {
expected := systemCases[i].output
sort.Strings(actual)
sort.Strings(expected)
require.True(t, reflect.DeepEqual(expected, actual),
"Expected: %s Actual: %s", expected, actual)
require.Equal(t, expected, actual)
}
}
@ -225,7 +222,7 @@ func TestArguments(t *testing.T) {
for _, system := range []string{"darwin", "linux", "anything else"} {
actual := p.args("www.google.com", system)
require.True(t, reflect.DeepEqual(actual, expected), "Expected: %s Actual: %s", expected, actual)
require.Equal(t, actual, expected)
}
}

3
plugins/inputs/ping/ping_windows_test.go
View File

@ -4,7 +4,6 @@ package ping
import (
"errors"
"reflect"
"testing"
"github.com/stretchr/testify/require"
@ -143,7 +142,7 @@ func TestArguments(t *testing.T) {
}
actual := p.args("www.google.com")
require.True(t, reflect.DeepEqual(actual, arguments), "Expected : %s Actual: %s", arguments, actual)
require.Equal(t, actual, arguments)
}
var lossyPingOutput = `

4
plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
View File

@ -149,13 +149,13 @@ func TestPostgresqlQueryOutputTestsIntegration(t *testing.T) {
"SELECT true AS myvalue": func(acc *testutil.Accumulator) {
v, found := acc.BoolField(measurement, "myvalue")
require.True(t, found)
require.Equal(t, true, v)
require.True(t, v)
},
"SELECT timestamp'1980-07-23' as ts, true AS myvalue": func(acc *testutil.Accumulator) {
expectedTime := time.Date(1980, 7, 23, 0, 0, 0, 0, time.UTC)
v, found := acc.BoolField(measurement, "myvalue")
require.True(t, found)
require.Equal(t, true, v)
require.True(t, v)
require.True(t, acc.HasTimestamp(measurement, expectedTime))
},
}

11
plugins/inputs/prometheus/kubernetes_test.go
View File

@ -3,13 +3,12 @@ package prometheus
import (
"testing"
"k8s.io/client-go/tools/cache"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
"github.com/influxdata/telegraf/testutil"
)
@ -217,12 +216,12 @@ func TestPodHasMatchingNamespace(t *testing.T) {
pod.Name = "Pod1"
pod.Namespace = "default"
shouldMatch := podHasMatchingNamespace(pod, prom)
require.Equal(t, true, shouldMatch)
require.True(t, shouldMatch)
pod.Name = "Pod2"
pod.Namespace = "namespace"
shouldNotMatch := podHasMatchingNamespace(pod, prom)
require.Equal(t, false, shouldNotMatch)
require.False(t, shouldNotMatch)
}
func TestPodHasMatchingLabelSelector(t *testing.T) {
@ -240,7 +239,7 @@ func TestPodHasMatchingLabelSelector(t *testing.T) {
labelSelector, err := labels.Parse(prom.KubernetesLabelSelector)
require.Equal(t, err, nil)
require.Equal(t, true, podHasMatchingLabelSelector(pod, labelSelector))
require.True(t, podHasMatchingLabelSelector(pod, labelSelector))
}
func TestPodHasMatchingFieldSelector(t *testing.T) {
@ -252,7 +251,7 @@ func TestPodHasMatchingFieldSelector(t *testing.T) {
fieldSelector, err := fields.ParseSelector(prom.KubernetesFieldSelector)
require.Equal(t, err, nil)
require.Equal(t, true, podHasMatchingFieldSelector(pod, fieldSelector))
require.True(t, podHasMatchingFieldSelector(pod, fieldSelector))
}
func TestInvalidFieldSelector(t *testing.T) {

7
plugins/inputs/prometheus/prometheus_test.go
View File

@ -10,13 +10,12 @@ import (
"testing"
"time"
"github.com/influxdata/telegraf/config"
"github.com/influxdata/telegraf/metric"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/fields"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/config"
"github.com/influxdata/telegraf/metric"
"github.com/influxdata/telegraf/testutil"
)
@ -495,7 +494,7 @@ func TestUnsupportedFieldSelector(t *testing.T) {
fieldSelector, _ := fields.ParseSelector(prom.KubernetesFieldSelector)
isValid, invalidSelector := fieldSelectorIsSupported(fieldSelector)
require.Equal(t, false, isValid)
require.False(t, isValid)
require.Equal(t, "spec.containerName", invalidSelector)
}

21
plugins/inputs/radius/radius_test.go
View File

@ -8,12 +8,13 @@ import (
"testing"
"time"
"github.com/influxdata/telegraf/config"
"github.com/influxdata/telegraf/testutil"
"github.com/stretchr/testify/require"
"github.com/testcontainers/testcontainers-go/wait"
"layeh.com/radius"
"layeh.com/radius/rfc2865"
"github.com/influxdata/telegraf/config"
"github.com/influxdata/telegraf/testutil"
)
func TestRadiusLocal(t *testing.T) {
@ -69,13 +70,13 @@ func TestRadiusLocal(t *testing.T) {
if !acc.HasMeasurement("radius") {
t.Errorf("acc.HasMeasurement: expected radius")
}
require.Equal(t, true, acc.HasTag("radius", "source"))
require.Equal(t, true, acc.HasTag("radius", "source_port"))
require.Equal(t, true, acc.HasTag("radius", "response_code"))
require.True(t, acc.HasTag("radius", "source"))
require.True(t, acc.HasTag("radius", "source_port"))
require.True(t, acc.HasTag("radius", "response_code"))
require.Equal(t, host, acc.TagValue("radius", "source"))
require.Equal(t, port, acc.TagValue("radius", "source_port"))
require.Equal(t, radius.CodeAccessAccept.String(), acc.TagValue("radius", "response_code"))
require.Equal(t, true, acc.HasInt64Field("radius", "responsetime_ms"))
require.True(t, acc.HasInt64Field("radius", "responsetime_ms"))
if err := server.Shutdown(context.Background()); err != nil {
require.NoError(t, err, "failed to properly shutdown local radius server")
@ -183,12 +184,12 @@ func TestRadiusIntegration(t *testing.T) {
if !acc.HasMeasurement("radius") {
t.Errorf("acc.HasMeasurement: expected radius")
}
require.Equal(t, true, acc.HasTag("radius", "source"))
require.Equal(t, true, acc.HasTag("radius", "source_port"))
require.Equal(t, true, acc.HasTag("radius", "response_code"))
require.True(t, acc.HasTag("radius", "source"))
require.True(t, acc.HasTag("radius", "source_port"))
require.True(t, acc.HasTag("radius", "response_code"))
require.Equal(t, tt.expectedSource, acc.TagValue("radius", "source"))
require.Equal(t, tt.expectedSourcePort, acc.TagValue("radius", "source_port"))
require.Equal(t, true, acc.HasInt64Field("radius", "responsetime_ms"), true)
require.True(t, acc.HasInt64Field("radius", "responsetime_ms"), true)
if tt.expectSuccess {
require.Equal(t, radius.CodeAccessAccept.String(), acc.TagValue("radius", "response_code"))
} else {

4
plugins/inputs/riemann_listener/riemann_listener_test.go
View File

@ -35,7 +35,7 @@ func TestSocketListener_tcp(t *testing.T) {
Service: "hello",
})
require.NoError(t, err)
require.Equal(t, result.GetOk(), true)
require.True(t, result.GetOk())
// Check for stats no service specified
c = riemanngo.NewTCPClient("127.0.0.1:5555", 5*time.Second)
@ -43,7 +43,7 @@ func TestSocketListener_tcp(t *testing.T) {
defer c.Close()
result, err = riemanngo.SendEvent(c, &riemanngo.Event{})
require.Equal(t, false, result.GetOk())
require.False(t, result.GetOk())
require.Equal(t, "No Service Name", result.GetError())
require.NoError(t, err)
}

62
plugins/inputs/smart/smart_test.go
View File

@ -6,18 +6,18 @@ import (
"testing"
"time"
"github.com/stretchr/testify/require"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/config"
"github.com/influxdata/telegraf/testutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestGatherAttributes(t *testing.T) {
s := newSmart()
s.Attributes = true
assert.Equal(t, time.Second*30, time.Duration(s.Timeout))
require.Equal(t, time.Second*30, time.Duration(s.Timeout))
runCmd = func(timeout config.Duration, sudo bool, command string, args ...string) ([]byte, error) {
if len(args) > 0 {
@ -38,7 +38,7 @@ func TestGatherAttributes(t *testing.T) {
s.PathSmartctl = "this_path_to_smartctl_does_not_exist"
err := s.Init()
assert.Error(t, err)
require.Error(t, err)
})
t.Run("Smartctl presence", func(t *testing.T) {
@ -52,7 +52,7 @@ func TestGatherAttributes(t *testing.T) {
err := s.Gather(&acc)
require.NoError(t, err)
assert.Equal(t, 68, acc.NFields(), "Wrong number of fields gathered")
require.Equal(t, 68, acc.NFields(), "Wrong number of fields gathered")
for _, test := range testsAda0Attributes {
acc.AssertContainsTaggedFields(t, "smart_attribute", test.fields, test.tags)
@ -69,7 +69,7 @@ func TestGatherAttributes(t *testing.T) {
err := s.Gather(&acc)
require.NoError(t, err)
assert.Equal(t, 32, acc.NFields(), "Wrong number of fields gathered")
require.Equal(t, 32, acc.NFields(), "Wrong number of fields gathered")
testutil.RequireMetricsEqual(t, testSmartctlNVMeAttributes, acc.GetTelegrafMetrics(),
testutil.SortMetrics(), testutil.IgnoreTime())
@ -147,7 +147,7 @@ func TestGatherNoAttributes(t *testing.T) {
s := newSmart()
s.Attributes = false
assert.Equal(t, time.Second*30, time.Duration(s.Timeout))
require.Equal(t, time.Second*30, time.Duration(s.Timeout))
runCmd = func(timeout config.Duration, sudo bool, command string, args ...string) ([]byte, error) {
if len(args) > 0 {
@ -171,7 +171,7 @@ func TestGatherNoAttributes(t *testing.T) {
err := s.Gather(&acc)
require.NoError(t, err)
assert.Equal(t, 11, acc.NFields(), "Wrong number of fields gathered")
require.Equal(t, 11, acc.NFields(), "Wrong number of fields gathered")
acc.AssertDoesNotContainMeasurement(t, "smart_attribute")
for _, test := range testsAda0Device {
@ -184,9 +184,9 @@ func TestGatherNoAttributes(t *testing.T) {
}
func TestExcludedDev(t *testing.T) {
assert.Equal(t, true, excludedDev([]string{"/dev/pass6"}, "/dev/pass6 -d atacam"), "Should be excluded.")
assert.Equal(t, false, excludedDev([]string{}, "/dev/pass6 -d atacam"), "Shouldn't be excluded.")
assert.Equal(t, false, excludedDev([]string{"/dev/pass6"}, "/dev/pass1 -d atacam"), "Shouldn't be excluded.")
require.True(t, excludedDev([]string{"/dev/pass6"}, "/dev/pass6 -d atacam"), "Should be excluded.")
require.False(t, excludedDev([]string{}, "/dev/pass6 -d atacam"), "Shouldn't be excluded.")
require.False(t, excludedDev([]string{"/dev/pass6"}, "/dev/pass1 -d atacam"), "Shouldn't be excluded.")
}
var (
@ -212,8 +212,8 @@ func TestGatherSATAInfo(t *testing.T) {
wg.Add(1)
sampleSmart.gatherDisk(acc, "", wg)
assert.Equal(t, 106, acc.NFields(), "Wrong number of fields gathered")
assert.Equal(t, uint64(20), acc.NMetrics(), "Wrong number of metrics gathered")
require.Equal(t, 106, acc.NFields(), "Wrong number of fields gathered")
require.Equal(t, uint64(20), acc.NMetrics(), "Wrong number of metrics gathered")
}
func TestGatherSATAInfo65(t *testing.T) {
@ -228,8 +228,8 @@ func TestGatherSATAInfo65(t *testing.T) {
wg.Add(1)
sampleSmart.gatherDisk(acc, "", wg)
assert.Equal(t, 96, acc.NFields(), "Wrong number of fields gathered")
assert.Equal(t, uint64(18), acc.NMetrics(), "Wrong number of metrics gathered")
require.Equal(t, 96, acc.NFields(), "Wrong number of fields gathered")
require.Equal(t, uint64(18), acc.NMetrics(), "Wrong number of metrics gathered")
}
func TestGatherHgstSAS(t *testing.T) {
@ -244,8 +244,8 @@ func TestGatherHgstSAS(t *testing.T) {
wg.Add(1)
sampleSmart.gatherDisk(acc, "", wg)
assert.Equal(t, 6, acc.NFields(), "Wrong number of fields gathered")
assert.Equal(t, uint64(4), acc.NMetrics(), "Wrong number of metrics gathered")
require.Equal(t, 6, acc.NFields(), "Wrong number of fields gathered")
require.Equal(t, uint64(4), acc.NMetrics(), "Wrong number of metrics gathered")
}
func TestGatherHtSAS(t *testing.T) {
@ -277,8 +277,8 @@ func TestGatherLongFormEnduranceAttrib(t *testing.T) {
wg.Add(1)
sampleSmart.gatherDisk(acc, "", wg)
assert.Equal(t, 7, acc.NFields(), "Wrong number of fields gathered")
assert.Equal(t, uint64(5), acc.NMetrics(), "Wrong number of metrics gathered")
require.Equal(t, 7, acc.NFields(), "Wrong number of fields gathered")
require.Equal(t, uint64(5), acc.NMetrics(), "Wrong number of metrics gathered")
}
func TestGatherSSD(t *testing.T) {
@ -293,8 +293,8 @@ func TestGatherSSD(t *testing.T) {
wg.Add(1)
sampleSmart.gatherDisk(acc, "", wg)
assert.Equal(t, 110, acc.NFields(), "Wrong number of fields gathered")
assert.Equal(t, uint64(26), acc.NMetrics(), "Wrong number of metrics gathered")
require.Equal(t, 110, acc.NFields(), "Wrong number of fields gathered")
require.Equal(t, uint64(26), acc.NMetrics(), "Wrong number of metrics gathered")
}
func TestGatherSSDRaid(t *testing.T) {
@ -309,8 +309,8 @@ func TestGatherSSDRaid(t *testing.T) {
wg.Add(1)
sampleSmart.gatherDisk(acc, "", wg)
assert.Equal(t, 77, acc.NFields(), "Wrong number of fields gathered")
assert.Equal(t, uint64(15), acc.NMetrics(), "Wrong number of metrics gathered")
require.Equal(t, 77, acc.NFields(), "Wrong number of fields gathered")
require.Equal(t, uint64(15), acc.NMetrics(), "Wrong number of metrics gathered")
}
func TestGatherNVMe(t *testing.T) {
@ -397,25 +397,25 @@ func TestGatherIntelNVMeDeprecatedFormatMetrics(t *testing.T) {
func Test_findVIDFromNVMeOutput(t *testing.T) {
device, err := findNVMeDeviceInfo(nvmeIdentifyController)
assert.Nil(t, err)
assert.Equal(t, "0x8086", device.vendorID)
assert.Equal(t, "CVFT5123456789ABCD", device.serialNumber)
assert.Equal(t, "INTEL SSDPEDABCDEFG", device.model)
require.Nil(t, err)
require.Equal(t, "0x8086", device.vendorID)
require.Equal(t, "CVFT5123456789ABCD", device.serialNumber)
require.Equal(t, "INTEL SSDPEDABCDEFG", device.model)
}
func Test_checkForNVMeDevices(t *testing.T) {
devices := []string{"sda1", "nvme0", "sda2", "nvme2"}
expectedNVMeDevices := []string{"nvme0", "nvme2"}
resultNVMeDevices := distinguishNVMeDevices(devices, expectedNVMeDevices)
assert.Equal(t, expectedNVMeDevices, resultNVMeDevices)
require.Equal(t, expectedNVMeDevices, resultNVMeDevices)
}
func Test_contains(t *testing.T) {
devices := []string{"/dev/sda", "/dev/nvme1"}
device := "/dev/nvme1"
deviceNotIncluded := "/dev/nvme5"
assert.True(t, contains(devices, device))
assert.False(t, contains(devices, deviceNotIncluded))
require.True(t, contains(devices, device))
require.False(t, contains(devices, deviceNotIncluded))
}
func Test_difference(t *testing.T) {
@ -423,7 +423,7 @@ func Test_difference(t *testing.T) {
secondDevices := []string{"/dev/sda", "/dev/nvme1"}
expected := []string{"/dev/nvme2"}
result := difference(devices, secondDevices)
assert.Equal(t, expected, result)
require.Equal(t, expected, result)
}
func Test_integerOverflow(t *testing.T) {

191
plugins/inputs/snmp/gosmi_test.go
View File

@ -7,7 +7,6 @@ import (
"time"
"github.com/gosnmp/gosnmp"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/influxdata/telegraf/internal/snmp"
@ -106,8 +105,8 @@ func TestFieldInitGosmi(t *testing.T) {
err := f.init(tr)
require.NoError(t, err, "inputOid=%q inputName=%q", txl.inputOid, txl.inputName)
assert.Equal(t, txl.expectedOid, f.Oid, "inputOid=%q inputName=%q inputConversion=%q", txl.inputOid, txl.inputName, txl.inputConversion)
assert.Equal(t, txl.expectedName, f.Name, "inputOid=%q inputName=%q inputConversion=%q", txl.inputOid, txl.inputName, txl.inputConversion)
require.Equal(t, txl.expectedOid, f.Oid, "inputOid=%q inputName=%q inputConversion=%q", txl.inputOid, txl.inputName, txl.inputConversion)
require.Equal(t, txl.expectedName, f.Name, "inputOid=%q inputName=%q inputConversion=%q", txl.inputOid, txl.inputName, txl.inputConversion)
}
}
@ -132,13 +131,13 @@ func TestTableInitGosmi(t *testing.T) {
err = s.Init()
require.NoError(t, err)
assert.Equal(t, "atTable", s.Tables[0].Name)
require.Equal(t, "atTable", s.Tables[0].Name)
assert.Len(t, s.Tables[0].Fields, 5)
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".999", Name: "foo", initialized: true})
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.1", Name: "atIfIndex", initialized: true, IsTag: true})
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.2", Name: "atPhysAddress", initialized: true, Conversion: "hwaddr"})
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.3", Name: "atNetAddress", initialized: true, IsTag: true})
require.Len(t, s.Tables[0].Fields, 5)
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".999", Name: "foo", initialized: true})
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.1", Name: "atIfIndex", initialized: true, IsTag: true})
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.2", Name: "atPhysAddress", initialized: true, Conversion: "hwaddr"})
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.3", Name: "atNetAddress", initialized: true, IsTag: true})
}
func TestSnmpInitGosmi(t *testing.T) {
@ -161,12 +160,12 @@ func TestSnmpInitGosmi(t *testing.T) {
err = s.Init()
require.NoError(t, err)
assert.Len(t, s.Tables[0].Fields, 3)
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.1", Name: "atIfIndex", IsTag: true, initialized: true})
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.2", Name: "atPhysAddress", initialized: true, Conversion: "hwaddr"})
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.3", Name: "atNetAddress", IsTag: true, initialized: true})
require.Len(t, s.Tables[0].Fields, 3)
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.1", Name: "atIfIndex", IsTag: true, initialized: true})
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.2", Name: "atPhysAddress", initialized: true, Conversion: "hwaddr"})
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.3.6.1.2.1.3.1.1.3", Name: "atNetAddress", IsTag: true, initialized: true})
assert.Equal(t, Field{
require.Equal(t, Field{
Oid: ".1.3.6.1.2.1.3.1.1.2",
Name: "atPhysAddress",
Conversion: "hwaddr",
@ -198,29 +197,29 @@ func TestSnmpInit_noTranslateGosmi(t *testing.T) {
err := s.Init()
require.NoError(t, err)
assert.Equal(t, ".9.1.1.1.1", s.Fields[0].Oid)
assert.Equal(t, "one", s.Fields[0].Name)
assert.Equal(t, true, s.Fields[0].IsTag)
require.Equal(t, ".9.1.1.1.1", s.Fields[0].Oid)
require.Equal(t, "one", s.Fields[0].Name)
require.True(t, s.Fields[0].IsTag)
assert.Equal(t, ".9.1.1.1.2", s.Fields[1].Oid)
assert.Equal(t, "two", s.Fields[1].Name)
assert.Equal(t, false, s.Fields[1].IsTag)
require.Equal(t, ".9.1.1.1.2", s.Fields[1].Oid)
require.Equal(t, "two", s.Fields[1].Name)
require.False(t, s.Fields[1].IsTag)
assert.Equal(t, ".9.1.1.1.3", s.Fields[2].Oid)
assert.Equal(t, ".9.1.1.1.3", s.Fields[2].Name)
assert.Equal(t, false, s.Fields[2].IsTag)
require.Equal(t, ".9.1.1.1.3", s.Fields[2].Oid)
require.Equal(t, ".9.1.1.1.3", s.Fields[2].Name)
require.False(t, s.Fields[2].IsTag)
assert.Equal(t, ".9.1.1.1.4", s.Tables[0].Fields[0].Oid)
assert.Equal(t, "four", s.Tables[0].Fields[0].Name)
assert.Equal(t, true, s.Tables[0].Fields[0].IsTag)
require.Equal(t, ".9.1.1.1.4", s.Tables[0].Fields[0].Oid)
require.Equal(t, "four", s.Tables[0].Fields[0].Name)
require.True(t, s.Tables[0].Fields[0].IsTag)
assert.Equal(t, ".9.1.1.1.5", s.Tables[0].Fields[1].Oid)
assert.Equal(t, "five", s.Tables[0].Fields[1].Name)
assert.Equal(t, false, s.Tables[0].Fields[1].IsTag)
require.Equal(t, ".9.1.1.1.5", s.Tables[0].Fields[1].Oid)
require.Equal(t, "five", s.Tables[0].Fields[1].Name)
require.False(t, s.Tables[0].Fields[1].IsTag)
assert.Equal(t, ".9.1.1.1.6", s.Tables[0].Fields[2].Oid)
assert.Equal(t, ".9.1.1.1.6", s.Tables[0].Fields[2].Name)
assert.Equal(t, false, s.Tables[0].Fields[2].IsTag)
require.Equal(t, ".9.1.1.1.6", s.Tables[0].Fields[2].Oid)
require.Equal(t, ".9.1.1.1.6", s.Tables[0].Fields[2].Name)
require.False(t, s.Tables[0].Fields[2].IsTag)
}
// TestTableBuild_walk in snmp_test.go is split into two tests here,
@ -268,7 +267,7 @@ func TestTableBuild_walk_noTranslate(t *testing.T) {
tb, err := tbl.Build(gosmiTsc, true, tr)
require.NoError(t, err)
assert.Equal(t, tb.Name, "mytable")
require.Equal(t, tb.Name, "mytable")
rtr1 := RTableRow{
Tags: map[string]string{
"myfield1": "foo",
@ -310,11 +309,11 @@ func TestTableBuild_walk_noTranslate(t *testing.T) {
"myfield3": float64(9.999),
},
}
assert.Len(t, tb.Rows, 4)
assert.Contains(t, tb.Rows, rtr1)
assert.Contains(t, tb.Rows, rtr2)
assert.Contains(t, tb.Rows, rtr3)
assert.Contains(t, tb.Rows, rtr4)
require.Len(t, tb.Rows, 4)
require.Contains(t, tb.Rows, rtr1)
require.Contains(t, tb.Rows, rtr2)
require.Contains(t, tb.Rows, rtr3)
require.Contains(t, tb.Rows, rtr4)
}
func TestTableBuild_walk_Translate(t *testing.T) {
@ -429,8 +428,8 @@ func TestTableBuild_noWalkGosmi(t *testing.T) {
Tags: map[string]string{"myfield1": "baz", "myfield3": "234"},
Fields: map[string]interface{}{"myfield2": 234},
}
assert.Len(t, tb.Rows, 1)
assert.Contains(t, tb.Rows, rtr)
require.Len(t, tb.Rows, 1)
require.Contains(t, tb.Rows, rtr)
}
func TestGatherGosmi(t *testing.T) {
@ -483,21 +482,21 @@ func TestGatherGosmi(t *testing.T) {
require.Len(t, acc.Metrics, 2)
m := acc.Metrics[0]
assert.Equal(t, "mytable", m.Measurement)
assert.Equal(t, "tsc", m.Tags[s.AgentHostTag])
assert.Equal(t, "baz", m.Tags["myfield1"])
assert.Len(t, m.Fields, 2)
assert.Equal(t, 234, m.Fields["myfield2"])
assert.Equal(t, "baz", m.Fields["myfield3"])
assert.False(t, tstart.After(m.Time))
assert.False(t, tstop.Before(m.Time))
require.Equal(t, "mytable", m.Measurement)
require.Equal(t, "tsc", m.Tags[s.AgentHostTag])
require.Equal(t, "baz", m.Tags["myfield1"])
require.Len(t, m.Fields, 2)
require.Equal(t, 234, m.Fields["myfield2"])
require.Equal(t, "baz", m.Fields["myfield3"])
require.False(t, tstart.After(m.Time))
require.False(t, tstop.Before(m.Time))
m2 := acc.Metrics[1]
assert.Equal(t, "myOtherTable", m2.Measurement)
assert.Equal(t, "tsc", m2.Tags[s.AgentHostTag])
assert.Equal(t, "baz", m2.Tags["myfield1"])
assert.Len(t, m2.Fields, 1)
assert.Equal(t, 123456, m2.Fields["myOtherField"])
require.Equal(t, "myOtherTable", m2.Measurement)
require.Equal(t, "tsc", m2.Tags[s.AgentHostTag])
require.Equal(t, "baz", m2.Tags["myfield1"])
require.Len(t, m2.Fields, 1)
require.Equal(t, 123456, m2.Fields["myOtherField"])
}
func TestGather_hostGosmi(t *testing.T) {
@ -527,7 +526,7 @@ func TestGather_hostGosmi(t *testing.T) {
require.Len(t, acc.Metrics, 1)
m := acc.Metrics[0]
assert.Equal(t, "baz", m.Tags["host"])
require.Equal(t, "baz", m.Tags["host"])
}
func TestFieldConvertGosmi(t *testing.T) {
@ -587,8 +586,8 @@ func TestFieldConvertGosmi(t *testing.T) {
for _, tc := range testTable {
act, err := fieldConvert(getGosmiTr(t), tc.conv, gosnmp.SnmpPDU{Name: ".1.3.6.1.2.1.2.2.1.8", Value: tc.input})
assert.NoError(t, err, "input=%T(%v) conv=%s expected=%T(%v)", tc.input, tc.input, tc.conv, tc.expected, tc.expected)
assert.EqualValues(t, tc.expected, act, "input=%T(%v) conv=%s expected=%T(%v)", tc.input, tc.input, tc.conv, tc.expected, tc.expected)
require.NoError(t, err, "input=%T(%v) conv=%s expected=%T(%v)", tc.input, tc.input, tc.conv, tc.expected, tc.expected)
require.EqualValues(t, tc.expected, act, "input=%T(%v) conv=%s expected=%T(%v)", tc.input, tc.input, tc.conv, tc.expected, tc.expected)
}
}
@ -596,14 +595,14 @@ func TestSnmpTranslateCache_missGosmi(t *testing.T) {
gosmiSnmpTranslateCaches = nil
oid := "IF-MIB::ifPhysAddress.1"
mibName, oidNum, oidText, conversion, err := getGosmiTr(t).SnmpTranslate(oid)
assert.Len(t, gosmiSnmpTranslateCaches, 1)
require.Len(t, gosmiSnmpTranslateCaches, 1)
stc := gosmiSnmpTranslateCaches[oid]
assert.NotNil(t, stc)
assert.Equal(t, mibName, stc.mibName)
assert.Equal(t, oidNum, stc.oidNum)
assert.Equal(t, oidText, stc.oidText)
assert.Equal(t, conversion, stc.conversion)
assert.Equal(t, err, stc.err)
require.NotNil(t, stc)
require.Equal(t, mibName, stc.mibName)
require.Equal(t, oidNum, stc.oidNum)
require.Equal(t, oidText, stc.oidText)
require.Equal(t, conversion, stc.conversion)
require.Equal(t, err, stc.err)
}
func TestSnmpTranslateCache_hitGosmi(t *testing.T) {
@ -617,11 +616,11 @@ func TestSnmpTranslateCache_hitGosmi(t *testing.T) {
},
}
mibName, oidNum, oidText, conversion, err := getGosmiTr(t).SnmpTranslate("foo")
assert.Equal(t, "a", mibName)
assert.Equal(t, "b", oidNum)
assert.Equal(t, "c", oidText)
assert.Equal(t, "d", conversion)
assert.Equal(t, fmt.Errorf("e"), err)
require.Equal(t, "a", mibName)
require.Equal(t, "b", oidNum)
require.Equal(t, "c", oidText)
require.Equal(t, "d", conversion)
require.Equal(t, fmt.Errorf("e"), err)
gosmiSnmpTranslateCaches = nil
}
@ -629,14 +628,14 @@ func TestSnmpTableCache_missGosmi(t *testing.T) {
gosmiSnmpTableCaches = nil
oid := ".1.0.0.0"
mibName, oidNum, oidText, fields, err := getGosmiTr(t).SnmpTable(oid)
assert.Len(t, gosmiSnmpTableCaches, 1)
require.Len(t, gosmiSnmpTableCaches, 1)
stc := gosmiSnmpTableCaches[oid]
assert.NotNil(t, stc)
assert.Equal(t, mibName, stc.mibName)
assert.Equal(t, oidNum, stc.oidNum)
assert.Equal(t, oidText, stc.oidText)
assert.Equal(t, fields, stc.fields)
assert.Equal(t, err, stc.err)
require.NotNil(t, stc)
require.Equal(t, mibName, stc.mibName)
require.Equal(t, oidNum, stc.oidNum)
require.Equal(t, oidText, stc.oidText)
require.Equal(t, fields, stc.fields)
require.Equal(t, err, stc.err)
}
func TestSnmpTableCache_hitGosmi(t *testing.T) {
@ -650,11 +649,11 @@ func TestSnmpTableCache_hitGosmi(t *testing.T) {
},
}
mibName, oidNum, oidText, fields, err := getGosmiTr(t).SnmpTable("foo")
assert.Equal(t, "a", mibName)
assert.Equal(t, "b", oidNum)
assert.Equal(t, "c", oidText)
assert.Equal(t, []Field{{Name: "d"}}, fields)
assert.Equal(t, fmt.Errorf("e"), err)
require.Equal(t, "a", mibName)
require.Equal(t, "b", oidNum)
require.Equal(t, "c", oidText)
require.Equal(t, []Field{{Name: "d"}}, fields)
require.Equal(t, fmt.Errorf("e"), err)
}
func TestTableJoin_walkGosmi(t *testing.T) {
@ -699,7 +698,7 @@ func TestTableJoin_walkGosmi(t *testing.T) {
tb, err := tbl.Build(gosmiTsc, true, tr)
require.NoError(t, err)
assert.Equal(t, tb.Name, "mytable")
require.Equal(t, tb.Name, "mytable")
rtr1 := RTableRow{
Tags: map[string]string{
"myfield1": "instance",
@ -733,10 +732,10 @@ func TestTableJoin_walkGosmi(t *testing.T) {
"myfield3": 3,
},
}
assert.Len(t, tb.Rows, 3)
assert.Contains(t, tb.Rows, rtr1)
assert.Contains(t, tb.Rows, rtr2)
assert.Contains(t, tb.Rows, rtr3)
require.Len(t, tb.Rows, 3)
require.Contains(t, tb.Rows, rtr1)
require.Contains(t, tb.Rows, rtr2)
require.Contains(t, tb.Rows, rtr3)
}
func TestTableOuterJoin_walkGosmi(t *testing.T) {
@ -782,7 +781,7 @@ func TestTableOuterJoin_walkGosmi(t *testing.T) {
tb, err := tbl.Build(gosmiTsc, true, tr)
require.NoError(t, err)
assert.Equal(t, tb.Name, "mytable")
require.Equal(t, tb.Name, "mytable")
rtr1 := RTableRow{
Tags: map[string]string{
"myfield1": "instance",
@ -825,11 +824,11 @@ func TestTableOuterJoin_walkGosmi(t *testing.T) {
"myfield5": 1,
},
}
assert.Len(t, tb.Rows, 4)
assert.Contains(t, tb.Rows, rtr1)
assert.Contains(t, tb.Rows, rtr2)
assert.Contains(t, tb.Rows, rtr3)
assert.Contains(t, tb.Rows, rtr4)
require.Len(t, tb.Rows, 4)
require.Contains(t, tb.Rows, rtr1)
require.Contains(t, tb.Rows, rtr2)
require.Contains(t, tb.Rows, rtr3)
require.Contains(t, tb.Rows, rtr4)
}
func TestTableJoinNoIndexAsTag_walkGosmi(t *testing.T) {
@ -874,7 +873,7 @@ func TestTableJoinNoIndexAsTag_walkGosmi(t *testing.T) {
tb, err := tbl.Build(gosmiTsc, true, tr)
require.NoError(t, err)
assert.Equal(t, tb.Name, "mytable")
require.Equal(t, tb.Name, "mytable")
rtr1 := RTableRow{
Tags: map[string]string{
"myfield1": "instance",
@ -908,10 +907,10 @@ func TestTableJoinNoIndexAsTag_walkGosmi(t *testing.T) {
"myfield3": 3,
},
}
assert.Len(t, tb.Rows, 3)
assert.Contains(t, tb.Rows, rtr1)
assert.Contains(t, tb.Rows, rtr2)
assert.Contains(t, tb.Rows, rtr3)
require.Len(t, tb.Rows, 3)
require.Contains(t, tb.Rows, rtr1)
require.Contains(t, tb.Rows, rtr2)
require.Contains(t, tb.Rows, rtr3)
}
func BenchmarkMibLoading(b *testing.B) {

296
plugins/inputs/snmp/snmp_test.go
View File

@ -10,11 +10,11 @@ import (
"time"
"github.com/gosnmp/gosnmp"
"github.com/stretchr/testify/require"
"github.com/influxdata/telegraf/config"
"github.com/influxdata/telegraf/internal/snmp"
"github.com/influxdata/telegraf/testutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
type testSNMPConnection struct {
@ -121,11 +121,9 @@ func TestFieldInit(t *testing.T) {
for _, txl := range translations {
f := Field{Oid: txl.inputOid, Name: txl.inputName, Conversion: txl.inputConversion}
err := f.init(tr)
if !assert.NoError(t, err, "inputOid=%q inputName=%q", txl.inputOid, txl.inputName) {
continue
}
assert.Equal(t, txl.expectedOid, f.Oid, "inputOid=%q inputName=%q inputConversion=%q", txl.inputOid, txl.inputName, txl.inputConversion)
assert.Equal(t, txl.expectedName, f.Name, "inputOid=%q inputName=%q inputConversion=%q", txl.inputOid, txl.inputName, txl.inputConversion)
require.NoError(t, err, "inputOid=%q inputName=%q", txl.inputOid, txl.inputName)
require.Equal(t, txl.expectedOid, f.Oid, "inputOid=%q inputName=%q inputConversion=%q", txl.inputOid, txl.inputName, txl.inputConversion)
require.Equal(t, txl.expectedName, f.Name, "inputOid=%q inputName=%q inputConversion=%q", txl.inputOid, txl.inputName, txl.inputConversion)
}
}
@ -140,14 +138,14 @@ func TestTableInit(t *testing.T) {
err := tbl.Init(NewNetsnmpTranslator())
require.NoError(t, err)
assert.Equal(t, "testTable", tbl.Name)
require.Equal(t, "testTable", tbl.Name)
assert.Len(t, tbl.Fields, 5)
assert.Contains(t, tbl.Fields, Field{Oid: ".999", Name: "foo", initialized: true})
assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.1", Name: "server", IsTag: true, initialized: true})
assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.2", Name: "connections", initialized: true})
assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.3", Name: "latency", initialized: true})
assert.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.4", Name: "description", IsTag: true, initialized: true})
require.Len(t, tbl.Fields, 5)
require.Contains(t, tbl.Fields, Field{Oid: ".999", Name: "foo", initialized: true})
require.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.1", Name: "server", IsTag: true, initialized: true})
require.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.2", Name: "connections", initialized: true})
require.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.3", Name: "latency", initialized: true})
require.Contains(t, tbl.Fields, Field{Oid: ".1.0.0.0.1.4", Name: "description", IsTag: true, initialized: true})
}
func TestSnmpInit(t *testing.T) {
@ -166,13 +164,13 @@ func TestSnmpInit(t *testing.T) {
err := s.Init()
require.NoError(t, err)
assert.Len(t, s.Tables[0].Fields, 4)
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.1", Name: "server", IsTag: true, initialized: true})
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.2", Name: "connections", initialized: true})
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.3", Name: "latency", initialized: true})
assert.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.4", Name: "description", initialized: true})
require.Len(t, s.Tables[0].Fields, 4)
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.1", Name: "server", IsTag: true, initialized: true})
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.2", Name: "connections", initialized: true})
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.3", Name: "latency", initialized: true})
require.Contains(t, s.Tables[0].Fields, Field{Oid: ".1.0.0.0.1.4", Name: "description", initialized: true})
assert.Equal(t, Field{
require.Equal(t, Field{
Oid: ".1.0.0.1.1",
Name: "hostname",
initialized: true,
@ -208,29 +206,29 @@ func TestSnmpInit_noTranslate(t *testing.T) {
err := s.Init()
require.NoError(t, err)
assert.Equal(t, ".1.1.1.1", s.Fields[0].Oid)
assert.Equal(t, "one", s.Fields[0].Name)
assert.Equal(t, true, s.Fields[0].IsTag)
require.Equal(t, ".1.1.1.1", s.Fields[0].Oid)
require.Equal(t, "one", s.Fields[0].Name)
require.True(t, s.Fields[0].IsTag)
assert.Equal(t, ".1.1.1.2", s.Fields[1].Oid)
assert.Equal(t, "two", s.Fields[1].Name)
assert.Equal(t, false, s.Fields[1].IsTag)
require.Equal(t, ".1.1.1.2", s.Fields[1].Oid)
require.Equal(t, "two", s.Fields[1].Name)
require.False(t, s.Fields[1].IsTag)
assert.Equal(t, ".1.1.1.3", s.Fields[2].Oid)
assert.Equal(t, ".1.1.1.3", s.Fields[2].Name)
assert.Equal(t, false, s.Fields[2].IsTag)
require.Equal(t, ".1.1.1.3", s.Fields[2].Oid)
require.Equal(t, ".1.1.1.3", s.Fields[2].Name)
require.False(t, s.Fields[2].IsTag)
assert.Equal(t, ".1.1.1.4", s.Tables[0].Fields[0].Oid)
assert.Equal(t, "four", s.Tables[0].Fields[0].Name)
assert.Equal(t, true, s.Tables[0].Fields[0].IsTag)
require.Equal(t, ".1.1.1.4", s.Tables[0].Fields[0].Oid)
require.Equal(t, "four", s.Tables[0].Fields[0].Name)
require.True(t, s.Tables[0].Fields[0].IsTag)
assert.Equal(t, ".1.1.1.5", s.Tables[0].Fields[1].Oid)
assert.Equal(t, "five", s.Tables[0].Fields[1].Name)
assert.Equal(t, false, s.Tables[0].Fields[1].IsTag)
require.Equal(t, ".1.1.1.5", s.Tables[0].Fields[1].Oid)
require.Equal(t, "five", s.Tables[0].Fields[1].Name)
require.False(t, s.Tables[0].Fields[1].IsTag)
assert.Equal(t, ".1.1.1.6", s.Tables[0].Fields[2].Oid)
assert.Equal(t, ".1.1.1.6", s.Tables[0].Fields[2].Name)
assert.Equal(t, false, s.Tables[0].Fields[2].IsTag)
require.Equal(t, ".1.1.1.6", s.Tables[0].Fields[2].Oid)
require.Equal(t, ".1.1.1.6", s.Tables[0].Fields[2].Name)
require.False(t, s.Tables[0].Fields[2].IsTag)
}
func TestSnmpInit_noName_noOid(t *testing.T) {
@ -265,25 +263,25 @@ func TestGetSNMPConnection_v2(t *testing.T) {
gsc, err := s.getConnection(0)
require.NoError(t, err)
gs := gsc.(snmp.GosnmpWrapper)
assert.Equal(t, "1.2.3.4", gs.Target)
assert.EqualValues(t, 567, gs.Port)
assert.Equal(t, gosnmp.Version2c, gs.Version)
assert.Equal(t, "foo", gs.Community)
assert.Equal(t, "udp", gs.Transport)
require.Equal(t, "1.2.3.4", gs.Target)
require.EqualValues(t, 567, gs.Port)
require.Equal(t, gosnmp.Version2c, gs.Version)
require.Equal(t, "foo", gs.Community)
require.Equal(t, "udp", gs.Transport)
gsc, err = s.getConnection(1)
require.NoError(t, err)
gs = gsc.(snmp.GosnmpWrapper)
assert.Equal(t, "1.2.3.4", gs.Target)
assert.EqualValues(t, 161, gs.Port)
assert.Equal(t, "udp", gs.Transport)
require.Equal(t, "1.2.3.4", gs.Target)
require.EqualValues(t, 161, gs.Port)
require.Equal(t, "udp", gs.Transport)
gsc, err = s.getConnection(2)
require.NoError(t, err)
gs = gsc.(snmp.GosnmpWrapper)
assert.Equal(t, "127.0.0.1", gs.Target)
assert.EqualValues(t, 161, gs.Port)
assert.Equal(t, "udp", gs.Transport)
require.Equal(t, "127.0.0.1", gs.Target)
require.EqualValues(t, 161, gs.Port)
require.Equal(t, "udp", gs.Transport)
}
func TestGetSNMPConnectionTCP(t *testing.T) {
@ -305,8 +303,8 @@ func TestGetSNMPConnectionTCP(t *testing.T) {
gsc, err := s.getConnection(0)
require.NoError(t, err)
gs := gsc.(snmp.GosnmpWrapper)
assert.Equal(t, "127.0.0.1", gs.Target)
assert.Equal(t, "tcp", gs.Transport)
require.Equal(t, "127.0.0.1", gs.Target)
require.Equal(t, "tcp", gs.Transport)
}
func TestGetSNMPConnection_v3(t *testing.T) {
@ -334,20 +332,20 @@ func TestGetSNMPConnection_v3(t *testing.T) {
gsc, err := s.getConnection(0)
require.NoError(t, err)
gs := gsc.(snmp.GosnmpWrapper)
assert.Equal(t, gs.Version, gosnmp.Version3)
require.Equal(t, gs.Version, gosnmp.Version3)
sp := gs.SecurityParameters.(*gosnmp.UsmSecurityParameters)
assert.Equal(t, "1.2.3.4", gsc.Host())
assert.EqualValues(t, 20, gs.MaxRepetitions)
assert.Equal(t, "mycontext", gs.ContextName)
assert.Equal(t, gosnmp.AuthPriv, gs.MsgFlags&gosnmp.AuthPriv)
assert.Equal(t, "myuser", sp.UserName)
assert.Equal(t, gosnmp.MD5, sp.AuthenticationProtocol)
assert.Equal(t, "password123", sp.AuthenticationPassphrase)
assert.Equal(t, gosnmp.DES, sp.PrivacyProtocol)
assert.Equal(t, "321drowssap", sp.PrivacyPassphrase)
assert.Equal(t, "myengineid", sp.AuthoritativeEngineID)
assert.EqualValues(t, 1, sp.AuthoritativeEngineBoots)
assert.EqualValues(t, 2, sp.AuthoritativeEngineTime)
require.Equal(t, "1.2.3.4", gsc.Host())
require.EqualValues(t, 20, gs.MaxRepetitions)
require.Equal(t, "mycontext", gs.ContextName)
require.Equal(t, gosnmp.AuthPriv, gs.MsgFlags&gosnmp.AuthPriv)
require.Equal(t, "myuser", sp.UserName)
require.Equal(t, gosnmp.MD5, sp.AuthenticationProtocol)
require.Equal(t, "password123", sp.AuthenticationPassphrase)
require.Equal(t, gosnmp.DES, sp.PrivacyProtocol)
require.Equal(t, "321drowssap", sp.PrivacyPassphrase)
require.Equal(t, "myengineid", sp.AuthoritativeEngineID)
require.EqualValues(t, 1, sp.AuthoritativeEngineBoots)
require.EqualValues(t, 2, sp.AuthoritativeEngineTime)
}
func TestGetSNMPConnection_v3_blumenthal(t *testing.T) {
@ -455,20 +453,20 @@ func TestGetSNMPConnection_v3_blumenthal(t *testing.T) {
gsc, err := s.getConnection(0)
require.NoError(t, err)
gs := gsc.(snmp.GosnmpWrapper)
assert.Equal(t, gs.Version, gosnmp.Version3)
require.Equal(t, gs.Version, gosnmp.Version3)
sp := gs.SecurityParameters.(*gosnmp.UsmSecurityParameters)
assert.Equal(t, "1.2.3.4", gsc.Host())
assert.EqualValues(t, 20, gs.MaxRepetitions)
assert.Equal(t, "mycontext", gs.ContextName)
assert.Equal(t, gosnmp.AuthPriv, gs.MsgFlags&gosnmp.AuthPriv)
assert.Equal(t, "myuser", sp.UserName)
assert.Equal(t, gosnmp.MD5, sp.AuthenticationProtocol)
assert.Equal(t, "password123", sp.AuthenticationPassphrase)
assert.Equal(t, tc.Algorithm, sp.PrivacyProtocol)
assert.Equal(t, "password123", sp.PrivacyPassphrase)
assert.Equal(t, "myengineid", sp.AuthoritativeEngineID)
assert.EqualValues(t, 1, sp.AuthoritativeEngineBoots)
assert.EqualValues(t, 2, sp.AuthoritativeEngineTime)
require.Equal(t, "1.2.3.4", gsc.Host())
require.EqualValues(t, 20, gs.MaxRepetitions)
require.Equal(t, "mycontext", gs.ContextName)
require.Equal(t, gosnmp.AuthPriv, gs.MsgFlags&gosnmp.AuthPriv)
require.Equal(t, "myuser", sp.UserName)
require.Equal(t, gosnmp.MD5, sp.AuthenticationProtocol)
require.Equal(t, "password123", sp.AuthenticationPassphrase)
require.Equal(t, tc.Algorithm, sp.PrivacyProtocol)
require.Equal(t, "password123", sp.PrivacyPassphrase)
require.Equal(t, "myengineid", sp.AuthoritativeEngineID)
require.EqualValues(t, 1, sp.AuthoritativeEngineBoots)
require.EqualValues(t, 2, sp.AuthoritativeEngineTime)
})
}
}
@ -490,9 +488,9 @@ func TestGetSNMPConnection_caching(t *testing.T) {
require.NoError(t, err)
gs4, err := s.getConnection(2)
require.NoError(t, err)
assert.Equal(t, gs1, gs2)
assert.NotEqual(t, gs2, gs3)
assert.NotEqual(t, gs3, gs4)
require.Equal(t, gs1, gs2)
require.NotEqual(t, gs2, gs3)
require.NotEqual(t, gs3, gs4)
}
func TestGosnmpWrapper_walk_retry(t *testing.T) {
@ -543,9 +541,9 @@ func TestGosnmpWrapper_walk_retry(t *testing.T) {
err = gsw.Walk(".1.0.0", func(_ gosnmp.SnmpPDU) error { return nil })
require.NoError(t, srvr.Close())
wg.Wait()
assert.Error(t, err)
assert.NotEqual(t, gs.Conn, conn)
assert.Equal(t, (gs.Retries+1)*2, reqCount)
require.Error(t, err)
require.NotEqual(t, gs.Conn, conn)
require.Equal(t, (gs.Retries+1)*2, reqCount)
}
func TestGosnmpWrapper_get_retry(t *testing.T) {
@ -596,9 +594,9 @@ func TestGosnmpWrapper_get_retry(t *testing.T) {
_, err = gsw.Get([]string{".1.0.0"})
require.NoError(t, srvr.Close())
wg.Wait()
assert.Error(t, err)
assert.NotEqual(t, gs.Conn, conn)
assert.Equal(t, (gs.Retries+1)*2, reqCount)
require.Error(t, err)
require.NotEqual(t, gs.Conn, conn)
require.Equal(t, (gs.Retries+1)*2, reqCount)
}
func TestTableBuild_walk(t *testing.T) {
@ -646,7 +644,7 @@ func TestTableBuild_walk(t *testing.T) {
tb, err := tbl.Build(tsc, true, NewNetsnmpTranslator())
require.NoError(t, err)
assert.Equal(t, tb.Name, "mytable")
require.Equal(t, tb.Name, "mytable")
rtr1 := RTableRow{
Tags: map[string]string{
"myfield1": "foo",
@ -690,11 +688,11 @@ func TestTableBuild_walk(t *testing.T) {
"myfield3": float64(9.999),
},
}
assert.Len(t, tb.Rows, 4)
assert.Contains(t, tb.Rows, rtr1)
assert.Contains(t, tb.Rows, rtr2)
assert.Contains(t, tb.Rows, rtr3)
assert.Contains(t, tb.Rows, rtr4)
require.Len(t, tb.Rows, 4)
require.Contains(t, tb.Rows, rtr1)
require.Contains(t, tb.Rows, rtr2)
require.Contains(t, tb.Rows, rtr3)
require.Contains(t, tb.Rows, rtr4)
}
func TestTableBuild_noWalk(t *testing.T) {
@ -733,8 +731,8 @@ func TestTableBuild_noWalk(t *testing.T) {
Tags: map[string]string{"myfield1": "baz", "myfield3": "234"},
Fields: map[string]interface{}{"myfield2": 234},
}
assert.Len(t, tb.Rows, 1)
assert.Contains(t, tb.Rows, rtr)
require.Len(t, tb.Rows, 1)
require.Contains(t, tb.Rows, rtr)
}
func TestGather(t *testing.T) {
@ -782,21 +780,21 @@ func TestGather(t *testing.T) {
require.Len(t, acc.Metrics, 2)
m := acc.Metrics[0]
assert.Equal(t, "mytable", m.Measurement)
assert.Equal(t, "tsc", m.Tags[s.AgentHostTag])
assert.Equal(t, "baz", m.Tags["myfield1"])
assert.Len(t, m.Fields, 2)
assert.Equal(t, 234, m.Fields["myfield2"])
assert.Equal(t, "baz", m.Fields["myfield3"])
assert.True(t, !tstart.After(m.Time))
assert.True(t, !tstop.Before(m.Time))
require.Equal(t, "mytable", m.Measurement)
require.Equal(t, "tsc", m.Tags[s.AgentHostTag])
require.Equal(t, "baz", m.Tags["myfield1"])
require.Len(t, m.Fields, 2)
require.Equal(t, 234, m.Fields["myfield2"])
require.Equal(t, "baz", m.Fields["myfield3"])
require.False(t, tstart.After(m.Time))
require.False(t, tstop.Before(m.Time))
m2 := acc.Metrics[1]
assert.Equal(t, "myOtherTable", m2.Measurement)
assert.Equal(t, "tsc", m2.Tags[s.AgentHostTag])
assert.Equal(t, "baz", m2.Tags["myfield1"])
assert.Len(t, m2.Fields, 1)
assert.Equal(t, 123456, m2.Fields["myOtherField"])
require.Equal(t, "myOtherTable", m2.Measurement)
require.Equal(t, "tsc", m2.Tags[s.AgentHostTag])
require.Equal(t, "baz", m2.Tags["myfield1"])
require.Len(t, m2.Fields, 1)
require.Equal(t, 123456, m2.Fields["myOtherField"])
}
func TestGather_host(t *testing.T) {
@ -826,7 +824,7 @@ func TestGather_host(t *testing.T) {
require.Len(t, acc.Metrics, 1)
m := acc.Metrics[0]
assert.Equal(t, "baz", m.Tags["host"])
require.Equal(t, "baz", m.Tags["host"])
}
func TestFieldConvert(t *testing.T) {
@ -884,10 +882,8 @@ func TestFieldConvert(t *testing.T) {
for _, tc := range testTable {
act, err := fieldConvert(NewNetsnmpTranslator(), tc.conv, gosnmp.SnmpPDU{Value: tc.input})
if !assert.NoError(t, err, "input=%T(%v) conv=%s expected=%T(%v)", tc.input, tc.input, tc.conv, tc.expected, tc.expected) {
continue
}
assert.EqualValues(t, tc.expected, act, "input=%T(%v) conv=%s expected=%T(%v)", tc.input, tc.input, tc.conv, tc.expected, tc.expected)
require.NoError(t, err, "input=%T(%v) conv=%s expected=%T(%v)", tc.input, tc.input, tc.conv, tc.expected, tc.expected)
require.EqualValues(t, tc.expected, act, "input=%T(%v) conv=%s expected=%T(%v)", tc.input, tc.input, tc.conv, tc.expected, tc.expected)
}
}
@ -895,14 +891,14 @@ func TestSnmpTranslateCache_miss(t *testing.T) {
snmpTranslateCaches = nil
oid := "IF-MIB::ifPhysAddress.1"
mibName, oidNum, oidText, conversion, err := NewNetsnmpTranslator().SnmpTranslate(oid)
assert.Len(t, snmpTranslateCaches, 1)
require.Len(t, snmpTranslateCaches, 1)
stc := snmpTranslateCaches[oid]
require.NotNil(t, stc)
assert.Equal(t, mibName, stc.mibName)
assert.Equal(t, oidNum, stc.oidNum)
assert.Equal(t, oidText, stc.oidText)
assert.Equal(t, conversion, stc.conversion)
assert.Equal(t, err, stc.err)
require.Equal(t, mibName, stc.mibName)
require.Equal(t, oidNum, stc.oidNum)
require.Equal(t, oidText, stc.oidText)
require.Equal(t, conversion, stc.conversion)
require.Equal(t, err, stc.err)
}
func TestSnmpTranslateCache_hit(t *testing.T) {
@ -916,11 +912,11 @@ func TestSnmpTranslateCache_hit(t *testing.T) {
},
}
mibName, oidNum, oidText, conversion, err := NewNetsnmpTranslator().SnmpTranslate("foo")
assert.Equal(t, "a", mibName)
assert.Equal(t, "b", oidNum)
assert.Equal(t, "c", oidText)
assert.Equal(t, "d", conversion)
assert.Equal(t, fmt.Errorf("e"), err)
require.Equal(t, "a", mibName)
require.Equal(t, "b", oidNum)
require.Equal(t, "c", oidText)
require.Equal(t, "d", conversion)
require.Equal(t, fmt.Errorf("e"), err)
snmpTranslateCaches = nil
}
@ -928,14 +924,14 @@ func TestSnmpTableCache_miss(t *testing.T) {
snmpTableCaches = nil
oid := ".1.0.0.0"
mibName, oidNum, oidText, fields, err := NewNetsnmpTranslator().SnmpTable(oid)
assert.Len(t, snmpTableCaches, 1)
require.Len(t, snmpTableCaches, 1)
stc := snmpTableCaches[oid]
require.NotNil(t, stc)
assert.Equal(t, mibName, stc.mibName)
assert.Equal(t, oidNum, stc.oidNum)
assert.Equal(t, oidText, stc.oidText)
assert.Equal(t, fields, stc.fields)
assert.Equal(t, err, stc.err)
require.Equal(t, mibName, stc.mibName)
require.Equal(t, oidNum, stc.oidNum)
require.Equal(t, oidText, stc.oidText)
require.Equal(t, fields, stc.fields)
require.Equal(t, err, stc.err)
}
func TestSnmpTableCache_hit(t *testing.T) {
@ -949,11 +945,11 @@ func TestSnmpTableCache_hit(t *testing.T) {
},
}
mibName, oidNum, oidText, fields, err := NewNetsnmpTranslator().SnmpTable("foo")
assert.Equal(t, "a", mibName)
assert.Equal(t, "b", oidNum)
assert.Equal(t, "c", oidText)
assert.Equal(t, []Field{{Name: "d"}}, fields)
assert.Equal(t, fmt.Errorf("e"), err)
require.Equal(t, "a", mibName)
require.Equal(t, "b", oidNum)
require.Equal(t, "c", oidText)
require.Equal(t, []Field{{Name: "d"}}, fields)
require.Equal(t, fmt.Errorf("e"), err)
}
func TestTableJoin_walk(t *testing.T) {
@ -992,7 +988,7 @@ func TestTableJoin_walk(t *testing.T) {
tb, err := tbl.Build(tsc, true, NewNetsnmpTranslator())
require.NoError(t, err)
assert.Equal(t, tb.Name, "mytable")
require.Equal(t, tb.Name, "mytable")
rtr1 := RTableRow{
Tags: map[string]string{
"myfield1": "instance",
@ -1026,10 +1022,10 @@ func TestTableJoin_walk(t *testing.T) {
"myfield3": 3,
},
}
assert.Len(t, tb.Rows, 3)
assert.Contains(t, tb.Rows, rtr1)
assert.Contains(t, tb.Rows, rtr2)
assert.Contains(t, tb.Rows, rtr3)
require.Len(t, tb.Rows, 3)
require.Contains(t, tb.Rows, rtr1)
require.Contains(t, tb.Rows, rtr2)
require.Contains(t, tb.Rows, rtr3)
}
func TestTableOuterJoin_walk(t *testing.T) {
@ -1069,7 +1065,7 @@ func TestTableOuterJoin_walk(t *testing.T) {
tb, err := tbl.Build(tsc, true, NewNetsnmpTranslator())
require.NoError(t, err)
assert.Equal(t, tb.Name, "mytable")
require.Equal(t, tb.Name, "mytable")
rtr1 := RTableRow{
Tags: map[string]string{
"myfield1": "instance",
@ -1112,11 +1108,11 @@ func TestTableOuterJoin_walk(t *testing.T) {
"myfield5": 1,
},
}
assert.Len(t, tb.Rows, 4)
assert.Contains(t, tb.Rows, rtr1)
assert.Contains(t, tb.Rows, rtr2)
assert.Contains(t, tb.Rows, rtr3)
assert.Contains(t, tb.Rows, rtr4)
require.Len(t, tb.Rows, 4)
require.Contains(t, tb.Rows, rtr1)
require.Contains(t, tb.Rows, rtr2)
require.Contains(t, tb.Rows, rtr3)
require.Contains(t, tb.Rows, rtr4)
}
func TestTableJoinNoIndexAsTag_walk(t *testing.T) {
@ -1155,7 +1151,7 @@ func TestTableJoinNoIndexAsTag_walk(t *testing.T) {
tb, err := tbl.Build(tsc, true, NewNetsnmpTranslator())
require.NoError(t, err)
assert.Equal(t, tb.Name, "mytable")
require.Equal(t, tb.Name, "mytable")
rtr1 := RTableRow{
Tags: map[string]string{
"myfield1": "instance",
@ -1189,8 +1185,8 @@ func TestTableJoinNoIndexAsTag_walk(t *testing.T) {
"myfield3": 3,
},
}
assert.Len(t, tb.Rows, 3)
assert.Contains(t, tb.Rows, rtr1)
assert.Contains(t, tb.Rows, rtr2)
assert.Contains(t, tb.Rows, rtr3)
require.Len(t, tb.Rows, 3)
require.Contains(t, tb.Rows, rtr1)
require.Contains(t, tb.Rows, rtr2)
require.Contains(t, tb.Rows, rtr3)
}

22
plugins/inputs/supervisor/supervisor_test.go
View File

@ -161,15 +161,15 @@ func TestIntegration_BasicGathering(t *testing.T) {
var acc testutil.Accumulator
err = acc.GatherError(s.Gather)
require.NoError(t, err)
require.Equal(t, acc.HasField("supervisor_processes", "uptime"), true)
require.Equal(t, acc.HasField("supervisor_processes", "state"), true)
require.Equal(t, acc.HasField("supervisor_processes", "pid"), true)
require.Equal(t, acc.HasField("supervisor_processes", "exitCode"), true)
require.Equal(t, acc.HasField("supervisor_instance", "state"), true)
require.Equal(t, acc.HasTag("supervisor_processes", "id"), true)
require.Equal(t, acc.HasTag("supervisor_processes", "source"), true)
require.Equal(t, acc.HasTag("supervisor_processes", "port"), true)
require.Equal(t, acc.HasTag("supervisor_instance", "id"), true)
require.Equal(t, acc.HasTag("supervisor_instance", "source"), true)
require.Equal(t, acc.HasTag("supervisor_instance", "port"), true)
require.True(t, acc.HasField("supervisor_processes", "uptime"))
require.True(t, acc.HasField("supervisor_processes", "state"))
require.True(t, acc.HasField("supervisor_processes", "pid"))
require.True(t, acc.HasField("supervisor_processes", "exitCode"))
require.True(t, acc.HasField("supervisor_instance", "state"))
require.True(t, acc.HasTag("supervisor_processes", "id"))
require.True(t, acc.HasTag("supervisor_processes", "source"))
require.True(t, acc.HasTag("supervisor_processes", "port"))
require.True(t, acc.HasTag("supervisor_instance", "id"))
require.True(t, acc.HasTag("supervisor_instance", "source"))
require.True(t, acc.HasTag("supervisor_instance", "port"))
}

22
plugins/inputs/tacacs/tacacs_test.go
View File

@ -221,18 +221,18 @@ func TestTacacsLocal(t *testing.T) {
if tt.errContains == "" {
require.Len(t, acc.Errors, 0)
require.Equal(t, true, acc.HasMeasurement("tacacs"))
require.Equal(t, true, acc.HasTag("tacacs", "source"))
require.True(t, acc.HasMeasurement("tacacs"))
require.True(t, acc.HasTag("tacacs", "source"))
require.Equal(t, srvLocal, acc.TagValue("tacacs", "source"))
require.Equal(t, true, acc.HasInt64Field("tacacs", "responsetime_ms"))
require.Equal(t, true, acc.HasStringField("tacacs", "response_status"))
require.True(t, acc.HasInt64Field("tacacs", "responsetime_ms"))
require.True(t, acc.HasStringField("tacacs", "response_status"))
require.Equal(t, tt.reqRespStatus, acc.Metrics[0].Fields["response_status"])
} else {
require.Len(t, acc.Errors, 1)
require.ErrorContains(t, acc.FirstError(), tt.errContains)
require.Equal(t, false, acc.HasTag("tacacs", "source"))
require.Equal(t, false, acc.HasInt64Field("tacacs", "responsetime_ms"))
require.Equal(t, false, acc.HasStringField("tacacs", "response_status"))
require.False(t, acc.HasTag("tacacs", "source"))
require.False(t, acc.HasInt64Field("tacacs", "responsetime_ms"))
require.False(t, acc.HasStringField("tacacs", "response_status"))
}
})
}
@ -303,10 +303,10 @@ func TestTacacsIntegration(t *testing.T) {
require.NoError(t, acc.FirstError())
require.Equal(t, true, acc.HasMeasurement("tacacs"))
require.Equal(t, true, acc.HasStringField("tacacs", "response_status"))
require.Equal(t, true, acc.HasInt64Field("tacacs", "responsetime_ms"))
require.Equal(t, true, acc.HasTag("tacacs", "source"))
require.True(t, acc.HasMeasurement("tacacs"))
require.True(t, acc.HasStringField("tacacs", "response_status"))
require.True(t, acc.HasInt64Field("tacacs", "responsetime_ms"))
require.True(t, acc.HasTag("tacacs", "source"))
require.Equal(t, tt.reqRespStatus, acc.Metrics[0].Fields["response_status"])
require.Equal(t, container.Address+":"+port, acc.TagValue("tacacs", "source"))

7
plugins/outputs/amqp/amqp_test.go
View File

@ -4,9 +4,10 @@ import (
"testing"
"time"
"github.com/influxdata/telegraf/config"
amqp "github.com/rabbitmq/amqp091-go"
"github.com/stretchr/testify/require"
"github.com/influxdata/telegraf/config"
)
type MockClient struct {
@ -63,8 +64,8 @@ func TestConnect(t *testing.T) {
require.Equal(t, []string{DefaultURL}, cfg.brokers)
require.Equal(t, "", cfg.exchange)
require.Equal(t, "topic", cfg.exchangeType)
require.Equal(t, false, cfg.exchangePassive)
require.Equal(t, true, cfg.exchangeDurable)
require.False(t, cfg.exchangePassive)
require.True(t, cfg.exchangeDurable)
require.Equal(t, amqp.Table(nil), cfg.exchangeArguments)
require.Equal(t, amqp.Table{
"database": DefaultDatabase,

11
plugins/outputs/sensu/sensu_test.go
View File

@ -9,11 +9,12 @@ import (
"net/http/httptest"
"testing"
corev2 "github.com/sensu/sensu-go/api/core/v2"
"github.com/stretchr/testify/require"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal/choice"
"github.com/influxdata/telegraf/testutil"
corev2 "github.com/sensu/sensu-go/api/core/v2"
"github.com/stretchr/testify/require"
)
func TestResolveEventEndpointUrl(t *testing.T) {
@ -126,7 +127,7 @@ func TestConnectAndWrite(t *testing.T) {
require.Equal(t, testCheck, receivedEvent.Check.Name)
require.Equal(t, testEntity, receivedEvent.Entity.Name)
require.NotEmpty(t, receivedEvent.Metrics)
require.Equal(t, true, choice.Contains(testHandler, receivedEvent.Metrics.Handlers))
require.True(t, choice.Contains(testHandler, receivedEvent.Metrics.Handlers))
require.NotEmpty(t, receivedEvent.Metrics.Points)
pointFound := false
tagFound := false
@ -141,8 +142,8 @@ func TestConnectAndWrite(t *testing.T) {
}
}
}
require.Equal(t, true, pointFound)
require.Equal(t, true, tagFound)
require.True(t, pointFound)
require.True(t, tagFound)
w.WriteHeader(http.StatusCreated)
})
err := plugin.Write([]telegraf.Metric{testutil.TestMetric(expectedPointValue, expectedPointName)})

2
plugins/outputs/timestream/timestream_internal_test.go
View File

@ -94,7 +94,7 @@ func testConvertValueSupportedCases(t *testing.T,
inputValues []interface{}, outputValues []string, outputValueTypes []types.MeasureValueType) {
for i, inputValue := range inputValues {
v, vt, ok := convertValue(inputValue)
require.Equal(t, true, ok, "Expected successful conversion")
require.True(t, ok, "Expected successful conversion")
require.Equal(t, outputValues[i], v, "Expected different string representation of converted value")
require.Equal(t, outputValueTypes[i], vt, "Expected different value type of converted value")
}

11
plugins/parsers/json/parser_test.go
View File

@ -5,10 +5,11 @@ import (
"testing"
"time"
"github.com/stretchr/testify/require"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal/fuzz"
"github.com/influxdata/telegraf/testutil"
"github.com/stretchr/testify/require"
)
const (
@ -671,7 +672,7 @@ func TestTimeParser(t *testing.T) {
metrics, err := parser.Parse([]byte(testString))
require.NoError(t, err)
require.Equal(t, 2, len(metrics))
require.Equal(t, false, metrics[0].Time() == metrics[1].Time())
require.False(t, metrics[0].Time() == metrics[1].Time())
}
func TestTimeParserWithTimezone(t *testing.T) {
@ -725,7 +726,7 @@ func TestUnixTimeParser(t *testing.T) {
metrics, err := parser.Parse([]byte(testString))
require.NoError(t, err)
require.Equal(t, 2, len(metrics))
require.Equal(t, false, metrics[0].Time() == metrics[1].Time())
require.False(t, metrics[0].Time() == metrics[1].Time())
}
func TestUnixMsTimeParser(t *testing.T) {
@ -760,7 +761,7 @@ func TestUnixMsTimeParser(t *testing.T) {
metrics, err := parser.Parse([]byte(testString))
require.NoError(t, err)
require.Equal(t, 2, len(metrics))
require.Equal(t, false, metrics[0].Time() == metrics[1].Time())
require.False(t, metrics[0].Time() == metrics[1].Time())
}
func TestTimeErrors(t *testing.T) {
@ -814,7 +815,7 @@ func TestShareTimestamp(t *testing.T) {
metrics, err := parser.Parse([]byte(validJSONArrayMultiple))
require.NoError(t, err)
require.Equal(t, 2, len(metrics))
require.Equal(t, true, metrics[0].Time() == metrics[1].Time())
require.True(t, metrics[0].Time() == metrics[1].Time())
}
func TestNameKey(t *testing.T) {