PMM-7 Fix testifylint linter warnings (p2)

admin/commands/base_test.go

@@ -78,8 +78,8 @@ func TestCredentials(t *testing.T) {
 	credSourceX, _ := CreateDummyCredentialsExecutable(data)
 
 	t.Cleanup(func() {
-		assert.NoError(t, os.Remove(credSource))
-		assert.NoError(t, os.Remove(credSourceX))
+		require.NoError(t, os.Remove(credSource))
+		require.NoError(t, os.Remove(credSourceX))
 	})
 
 	t.Run("Reading", func(t *testing.T) {
@@ -178,15 +178,15 @@ func TestReadFile(t *testing.T) {
 		require.NoError(t, err)
 		defer func() {
 			err = cert.Close()
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			err = os.Remove(cert.Name())
-			assert.NoError(t, err)
+			require.NoError(t, err)
 		}()
 		_, err = cert.WriteString("cert")
 		require.NoError(t, err)
 
 		certificate, err := ReadFile(cert.Name())
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, "cert", certificate)
 	})
 
@@ -195,7 +195,7 @@ func TestReadFile(t *testing.T) {
 
 		filepath := "not-existed-file"
 		certificate, err := ReadFile(filepath)
-		assert.EqualError(t, err, fmt.Sprintf("cannot load file in path %q: open not-existed-file: no such file or directory", filepath))
+		require.EqualError(t, err, fmt.Sprintf("cannot load file in path %q: open not-existed-file: no such file or directory", filepath))
 		assert.Empty(t, certificate)
 	})
 

admin/commands/list_test.go

@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/percona/pmm/api/inventory/v1/json/client/agents_service"
 	"github.com/percona/pmm/api/inventory/v1/json/client/services_service"
@@ -222,7 +223,7 @@ func TestListJSONOutput(t *testing.T) {
 		}
 
 		res, err := json.Marshal(result)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		expected := `
 		{
 			"service": [
@@ -301,7 +302,7 @@ func TestListJSONOutput(t *testing.T) {
 		}
 
 		res, err := json.Marshal(result)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		expected := `{"service":[],"agent":[]}`
 		assert.Equal(t, expected, string(res))
 	})

admin/commands/management/add_mysql_test.go

@@ -19,6 +19,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	mservice "github.com/percona/pmm/api/management/v1/json/client/management_service"
 )
@@ -154,9 +155,7 @@ func TestRun(t *testing.T) {
 		}
 		_, err := cmd.RunCmd()
 
-		if assert.Error(t, err) {
-			expected := "Unrecognized option. To create a user, see https://docs.percona.com/percona-monitoring-and-management/3/install-pmm/install-pmm-client/connect-database/mysql/mysql.html#create-a-database-account-for-pmm"
-			assert.Equal(t, expected, err.Error())
-		}
+		expected := "Unrecognized option. To create a user, see https://docs.percona.com/percona-monitoring-and-management/3/install-pmm/install-pmm-client/connect-database/mysql/mysql.html#create-a-database-account-for-pmm"
+		require.Error(t, err, expected)
 	})
 }

admin/commands/summary_test.go

@@ -35,7 +35,7 @@ func TestSummary(t *testing.T) {
 	filename := f.Name()
 	t.Logf("Using temp file: %s", filename)
 
-	assert.NoError(t, f.Close())
+	require.NoError(t, f.Close())
 
 	t.Run("Summary default", func(t *testing.T) {
 		cmd := &SummaryCommand{
@@ -80,7 +80,7 @@ func TestSummary(t *testing.T) {
 
 		// Check there is a pprof dir with data inside the zip file
 		reader, err := zip.OpenReader(filename)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, expected, res)
 
 		hasPprofDir := false

agent/agents/cache/cache_test.go

@@ -146,27 +146,27 @@ func TestCacheErrors(t *testing.T) {
 		t.Parallel()
 		var err error
 		_, err = New(100, time.Second*100, 100, logrus.WithField("test", t.Name()))
-		assert.Error(t, err)
+		require.Error(t, err)
 
 		_, err = New([]float64{}, time.Second*100, 100, logrus.WithField("test", t.Name()))
-		assert.Error(t, err)
+		require.Error(t, err)
 
 		_, err = New(struct{}{}, time.Second*100, 100, logrus.WithField("test", t.Name()))
-		assert.Error(t, err)
+		require.Error(t, err)
 	})
 
 	t.Run("WrongTypeOnRefresh", func(t *testing.T) {
 		t.Parallel()
 		c, _ := New(make(map[int]int), time.Second*100, 100, logrus.WithField("test", t.Name()))
 		err := c.Set(map[int]string{1: "some string"})
-		assert.Error(t, err)
+		require.Error(t, err)
 	})
 
 	t.Run("WrongTypeOnGet", func(t *testing.T) {
 		t.Parallel()
 		c, _ := New(make(map[int]int), time.Second*100, 100, logrus.WithField("test", t.Name()))
 		dest := make(map[int]string)
 		err := c.Get(dest)
-		assert.Error(t, err)
+		require.Error(t, err)
 	})
 }

agent/agents/mongodb/mongolog/internal/monitor_test.go

@@ -47,11 +47,6 @@ const (
 func TestCollector(t *testing.T) {
 	t.Parallel()
 
-	logrus.SetLevel(logrus.TraceLevel)
-	t.Cleanup(func() {
-		logrus.SetLevel(logrus.InfoLevel)
-	})
-
 	tests, err := testFileNames(t)
 	require.NoError(t, err)
 	for _, test := range tests {

agent/agents/mongodb/profiler/internal/collector/collector_test.go

@@ -120,9 +120,6 @@ func TestCollector(t *testing.T) {
 	// cursorTimeout*time.Duration(maxLoops*2): Wait time between loops to produce iter.TryNext to return a false
 	timeout := time.Millisecond*time.Duration(maxDocs*maxLoops) + cursorTimeout*time.Duration(maxLoops*2) + 5*time.Second
 
-	logrus.SetLevel(logrus.TraceLevel)
-	defer logrus.SetLevel(logrus.InfoLevel)
-
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 

agent/agents/mongodb/profiler/internal/parser/parser_test.go

@@ -136,7 +136,7 @@ func TestParserRunning(t *testing.T) {
 		assert.Equal(t, expected.StartTS, actual.StartTS)
 		assert.Equal(t, expected.EndTS, actual.EndTS)
 		assert.Len(t, actual.Buckets, 1)
-		assert.InEpsilon(t, 1, actual.Buckets[0].Common.NumQueries, 0.001)
+		assert.InDelta(t, 1, actual.Buckets[0].Common.NumQueries, 0.001)
 
 	case <-time.After(d + 5*time.Second):
 		t.Error("test timeout")

agent/agents/mongodb/profiler/internal/profiler_test.go

@@ -59,9 +59,6 @@ func TestProfiler(t *testing.T) {
 	aggregator.DefaultInterval = time.Second
 	defer func() { aggregator.DefaultInterval = defaultInterval }()
 
-	logrus.SetLevel(logrus.TraceLevel)
-	defer logrus.SetLevel(logrus.InfoLevel)
-
 	sslDSNTemplate, files := tests.GetTestMongoDBWithSSLDSN(t, "../../../../")
 	tempDir := t.TempDir()
 	sslDSN, err := templates.RenderDSN(sslDSNTemplate, files, tempDir)
@@ -94,7 +91,7 @@ func testProfiler(t *testing.T, url string) {
 		dbName := fmt.Sprintf("test_%02d", i)
 		logrus.Traceln("create db", dbName)
 		_, err := sess.Database(dbName).Collection("test").InsertOne(context.TODO(), doc)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		i++
 	}
 	<-time.After(aggregator.DefaultInterval) // give it some time before starting profiler
@@ -121,7 +118,7 @@ func testProfiler(t *testing.T, url string) {
 		dbName := fmt.Sprintf("test_%02d", dbNumber)
 		logrus.Tracef("inserting value %d to %s", i, dbName)
 		_, err := sess.Database(dbName).Collection("people").InsertOne(context.TODO(), doc)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		i++
 	}
 	cursor, err := sess.Database("test_00").Collection("people").Find(context.TODO(), bson.M{"name_00\xff": "value_00\xff"})
@@ -186,17 +183,17 @@ func testProfiler(t *testing.T, url string) {
 			MResponseLengthP99: responseLength,
 		}
 		// TODO: fix protobuf equality https://jira.percona.com/browse/PMM-6743
-		assert.Equalf(t, expected.MDocsReturnedCnt, bucket.Mongodb.MDocsReturnedCnt, "wrong metrics MDocsReturnedCnt for db %s", bucket.Common.Database)
-		assert.Equalf(t, expected.MResponseLengthCnt, bucket.Mongodb.MResponseLengthCnt, "wrong metrics MResponseLengthCnt for db %s", bucket.Common.Database)
-		assert.Equalf(t, expected.MResponseLengthSum, bucket.Mongodb.MResponseLengthSum, "wrong metrics MResponseLengthSum for db %s", bucket.Common.Database)
-		assert.Equalf(t, expected.MResponseLengthMin, bucket.Mongodb.MResponseLengthMin, "wrong metrics MResponseLengthMin for db %s", bucket.Common.Database)
-		assert.Equalf(t, expected.MResponseLengthMax, bucket.Mongodb.MResponseLengthMax, "wrong metrics MResponseLengthMax for db %s", bucket.Common.Database)
-		assert.Equalf(t, expected.MResponseLengthP99, bucket.Mongodb.MResponseLengthP99, "wrong metrics MResponseLengthP99 for db %s", bucket.Common.Database)
-		assert.Equalf(t, expected.MDocsExaminedCnt, bucket.Mongodb.MDocsExaminedCnt, "wrong metrics MDocsExaminedCnt for db %s", bucket.Common.Database)
+		assert.InDeltaf(t, expected.MDocsReturnedCnt, bucket.Mongodb.MDocsReturnedCnt, 0.0001, "wrong metrics MDocsReturnedCnt for db %s", bucket.Common.Database)
+		assert.InDeltaf(t, expected.MResponseLengthCnt, bucket.Mongodb.MResponseLengthCnt, 0.0001, "wrong metrics MResponseLengthCnt for db %s", bucket.Common.Database)
+		assert.InDeltaf(t, expected.MResponseLengthSum, bucket.Mongodb.MResponseLengthSum, 0.0001, "wrong metrics MResponseLengthSum for db %s", bucket.Common.Database)
+		assert.InDeltaf(t, expected.MResponseLengthMin, bucket.Mongodb.MResponseLengthMin, 0.0001, "wrong metrics MResponseLengthMin for db %s", bucket.Common.Database)
+		assert.InDeltaf(t, expected.MResponseLengthMax, bucket.Mongodb.MResponseLengthMax, 0.0001, "wrong metrics MResponseLengthMax for db %s", bucket.Common.Database)
+		assert.InDeltaf(t, expected.MResponseLengthP99, bucket.Mongodb.MResponseLengthP99, 0.0001, "wrong metrics MResponseLengthP99 for db %s", bucket.Common.Database)
+		assert.InDeltaf(t, expected.MDocsExaminedCnt, bucket.Mongodb.MDocsExaminedCnt, 0.0001, "wrong metrics MDocsExaminedCnt for db %s", bucket.Common.Database)
 	}
 	require.NotNil(t, findBucket)
 	assert.Equal(t, `db.people.find({"name_00\ufffd":"?"})`, findBucket.Common.Fingerprint)
-	assert.Equal(t, docsCount, findBucket.Mongodb.MDocsReturnedSum)
+	assert.InDelta(t, docsCount, findBucket.Mongodb.MDocsReturnedSum, 0.0001)
 }
 
 func cleanUpDBs(t *testing.T, sess *mongo.Client) {

agent/agents/mongodb/shared/aggregator/aggregator_test.go

@@ -39,7 +39,7 @@ func TestAggregator(t *testing.T) {
 		t.Run("error if aggregator is not running", func(t *testing.T) {
 			a := New(time.Now(), "test-agent", logrus.WithField("component", "test"), truncate.GetMongoDBDefaultMaxQueryLength())
 			err := a.Add(context.TODO(), proto.SystemProfile{})
-			assert.EqualError(t, err, "aggregator is not running")
+			require.EqualError(t, err, "aggregator is not running")
 		})
 	})
 

agent/agents/mongodb/shared/fingerprinter/fingerprinter_test.go

@@ -114,9 +114,9 @@ func TestProfilerFingerprinter(t *testing.T) {
 
 		database := client.Database(dbName)
 		_, err = database.Collection("test").InsertOne(ctx, bson.M{"id": 0, "name": "test", "value": 1, "time": time.Now()})
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		_, err = database.Collection("secondcollection").InsertOne(ctx, bson.M{"id": 0, "name": "sec", "value": 2})
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		database.Collection("test").FindOne(ctx, bson.M{"id": 0})
 		database.Collection("test").FindOne(ctx, bson.M{"id": 1, "name": "test", "time": time.Now()})
 		database.Collection("test").FindOneAndUpdate(ctx, bson.M{"id": 0}, bson.M{"$set": bson.M{"name": "new"}})

agent/agents/mysql/slowlog/parser/parser_bench_test.go

@@ -50,7 +50,7 @@ func benchmarkFile(b *testing.B, name string) {
 			b.StopTimer()
 
 			r, err := filereader.NewSimpleFileReader(name)
-			assert.NoError(b, err)
+			require.NoError(b, err)
 			p := NewSlowLogParser(r, log.Options{})
 
 			b.StartTimer()
@@ -62,7 +62,7 @@ func benchmarkFile(b *testing.B, name string) {
 			b.StopTimer()
 
 			assert.Equal(b, io.EOF, p.Err())
-			assert.NoError(b, r.Close())
+			require.NoError(b, r.Close())
 		}
 	})
 }

agent/agents/mysql/slowlog/parser/parser_test.go

@@ -40,7 +40,7 @@ func parseSlowLog(t *testing.T, filepath string, opts log.Options) []log.Event {
 	r, err := filereader.NewSimpleFileReader(filepath)
 	require.NoError(t, err)
 	defer func() {
-		assert.NoError(t, r.Close())
+		require.NoError(t, r.Close())
 	}()
 
 	p := NewSlowLogParser(r, opts)
@@ -335,7 +335,7 @@ func TestParserSpecial(t *testing.T) {
 		r, err := filereader.NewSimpleFileReader(filepath.Join("testdata", "slow023.log"))
 		require.NoError(t, err)
 		defer func() {
-			assert.NoError(t, r.Close())
+			require.NoError(t, r.Close())
 		}()
 
 		opts := log.Options{

agent/agents/postgres/pgstatmonitor/pgstatmonitor_test.go

@@ -107,18 +107,18 @@ func TestPGStatMonitorSchema(t *testing.T) {
 	}
 
 	_, err := db.Exec("CREATE EXTENSION IF NOT EXISTS pg_stat_monitor SCHEMA public")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	defer func() {
 		_, err = db.Exec("DROP EXTENSION pg_stat_monitor")
-		assert.NoError(t, err)
+		require.NoError(t, err)
 	}()
 
 	vPG, err := getPGVersion(db.Querier)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	vPGSM, _, err := getPGMonitorVersion(db.Querier)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	_, view := newPgStatMonitorStructs(vPGSM, vPG)
 	structs, err := db.SelectAllFrom(view, "")
@@ -181,7 +181,7 @@ func TestPGStatMonitorSchema(t *testing.T) {
 	var selectCMDType, insertCMDType string
 	var mPlansCallsCnt, mPlansTimeCnt float32
 	pgsmVersion, _, err := getPGMonitorVersion(db.Querier)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	switch pgsmVersion {
 	case pgStatMonitorVersion06:
 	case pgStatMonitorVersion08:
@@ -224,7 +224,7 @@ func TestPGStatMonitorSchema(t *testing.T) {
 		actual := buckets[0]
 		actual.Common.Username = strings.ReplaceAll(actual.Common.Username, `"`, "")
 		assert.InDelta(t, 0, actual.Common.MQueryTimeSum, 0.09)
-		assert.InEpsilon(t, float32(5), actual.Postgresql.MSharedBlksHitSum+actual.Postgresql.MSharedBlksReadSum, 0.0001)
+		assert.InDelta(t, float32(5), actual.Postgresql.MSharedBlksHitSum+actual.Postgresql.MSharedBlksReadSum, 0.0001)
 		assert.InDelta(t, 1.5, actual.Postgresql.MSharedBlksHitCnt+actual.Postgresql.MSharedBlksReadCnt, 0.5)
 		example := ""
 
@@ -499,12 +499,10 @@ func TestPGStatMonitorSchema(t *testing.T) {
 		for i := 0; i < n; i++ {
 			id := i
 			query := fmt.Sprintf(`INSERT /* CheckMBlkReadTime controller='test' */ INTO %s (customer_id, first_name, last_name, active) VALUES (%d, 'John', 'Dow', TRUE)`, tableName, id)
-			waitGroup.Add(1)
-			go func() {
-				defer waitGroup.Done()
+			waitGroup.Go(func() {
 				_, err := db.Exec(query)
 				require.NoError(t, err)
-			}()
+			})
 		}
 		waitGroup.Wait()
 

agent/agents/postgres/pgstatmonitor/stat_monitor_cache_test.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/reform.v1"
 	"gopkg.in/reform.v1/dialects/postgresql"
@@ -38,18 +37,18 @@ func TestPGStatMonitorStructs(t *testing.T) {
 	}
 
 	_, err := db.Exec("CREATE EXTENSION IF NOT EXISTS pg_stat_monitor SCHEMA public")
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	defer func() {
 		_, err = db.Exec("DROP EXTENSION pg_stat_monitor")
-		assert.NoError(t, err)
+		require.NoError(t, err)
 	}()
 
 	m := setup(t, db, false, false)
 	settings, err := m.getSettings()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	normalizedQuery, err := settings.getNormalizedQueryValue()
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	current, cache, err := m.monitorCache.getStatMonitorExtended(context.TODO(), db.Querier, normalizedQuery, truncate.GetDefaultMaxQueryLength())