Fix equality assertions (#5157)

* Fix equality assertions

* Minor fix

Author: joanlopez

api/v1/metric_routes_test.go

@@ -70,7 +70,7 @@ func TestGetMetrics(t *testing.T) {
 
 		resMetrics := envelop.Metrics()
 		assert.Len(t, resMetrics, 1)
-		assert.Equal(t, resMetrics[0].Name, "my_metric")
+		assert.Equal(t, "my_metric", resMetrics[0].Name)
 	})
 }
 

cloudapi/api_test.go

@@ -58,7 +58,7 @@ func TestCreateTestRun(t *testing.T) {
 		})
 		assert.NoError(t, err)
 
-		assert.Equal(t, resp.ReferenceID, "1")
+		assert.Equal(t, "1", resp.ReferenceID)
 		assert.NotNil(t, resp.ConfigOverride)
 		assert.True(t, resp.ConfigOverride.AggregationPeriod.Valid)
 		assert.Equal(t, types.Duration(2*time.Second), resp.ConfigOverride.AggregationPeriod.Duration)
@@ -126,7 +126,7 @@ func TestCreateTestRun(t *testing.T) {
 		})
 		assert.NoError(t, err)
 
-		assert.Equal(t, resp.ReferenceID, "1")
+		assert.Equal(t, "1", resp.ReferenceID)
 		assert.NotNil(t, resp.ConfigOverride)
 		assert.True(t, resp.ConfigOverride.AggregationPeriod.Valid)
 		assert.Equal(t, types.Duration(2*time.Second), resp.ConfigOverride.AggregationPeriod.Duration)

cloudapi/config_test.go

@@ -57,7 +57,7 @@ func TestGetConsolidatedConfig(t *testing.T) {
 	t.Parallel()
 	config, warn, err := GetConsolidatedConfig(json.RawMessage(`{"token":"jsonraw"}`), nil, "", nil, nil)
 	require.NoError(t, err)
-	require.Equal(t, config.Token.String, "jsonraw")
+	require.Equal(t, "jsonraw", config.Token.String)
 	require.Empty(t, warn)
 
 	config, warn, err = GetConsolidatedConfig(
@@ -68,7 +68,7 @@ func TestGetConsolidatedConfig(t *testing.T) {
 		nil,
 	)
 	require.NoError(t, err)
-	require.Equal(t, config.Token.String, "ext")
+	require.Equal(t, "ext", config.Token.String)
 	require.Empty(t, warn)
 
 	config, warn, err = GetConsolidatedConfig(
@@ -79,7 +79,7 @@ func TestGetConsolidatedConfig(t *testing.T) {
 		nil,
 	)
 	require.NoError(t, err)
-	require.Equal(t, config.Token.String, "envvalue")
+	require.Equal(t, "envvalue", config.Token.String)
 	require.Empty(t, warn)
 }
 
@@ -89,13 +89,13 @@ func TestGetConsolidatedConfig_WithLegacyOnly(t *testing.T) {
 	config, warn, err := GetConsolidatedConfig(json.RawMessage(`{"token":"jsonraw"}`), nil, "", nil,
 		map[string]json.RawMessage{"loadimpact": json.RawMessage(`{"token":"ext"}`)})
 	require.NoError(t, err)
-	require.Equal(t, config.Token.String, "ext")
+	require.Equal(t, "ext", config.Token.String)
 	require.NotEmpty(t, warn)
 
 	config, warn, err = GetConsolidatedConfig(json.RawMessage(`{"token":"jsonraw"}`), map[string]string{"K6_CLOUD_TOKEN": "envvalue"}, "", nil,
 		map[string]json.RawMessage{"loadimpact": json.RawMessage(`{"token":"ext"}`)})
 	require.NoError(t, err)
-	require.Equal(t, config.Token.String, "envvalue")
+	require.Equal(t, "envvalue", config.Token.String)
 	require.NotEmpty(t, warn)
 }
 
@@ -111,7 +111,7 @@ func TestGetConsolidatedConfig_LegacyHasLowerPriority(t *testing.T) {
 	)
 
 	require.NoError(t, err)
-	require.Equal(t, config.Token.String, "cloud")
+	require.Equal(t, "cloud", config.Token.String)
 	require.Empty(t, warn)
 }
 
@@ -127,6 +127,6 @@ func TestGetConsolidatedConfig_EnvHasHigherPriority(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	require.Equal(t, config.Token.String, "envvalue")
+	require.Equal(t, "envvalue", config.Token.String)
 	require.Empty(t, warn)
 }

errext/errext_test.go

@@ -13,14 +13,14 @@ import (
 func assertHasHint(t *testing.T, err error, hint string) {
 	var typederr HasHint
 	require.ErrorAs(t, err, &typederr)
-	assert.Equal(t, typederr.Hint(), hint)
+	assert.Equal(t, hint, typederr.Hint())
 	assert.Contains(t, err.Error(), typederr.Error())
 }
 
 func assertHasExitCode(t *testing.T, err error, exitcode exitcodes.ExitCode) {
 	var typederr HasExitCode
 	require.ErrorAs(t, err, &typederr)
-	assert.Equal(t, typederr.ExitCode(), exitcode)
+	assert.Equal(t, exitcode, typederr.ExitCode())
 	assert.Contains(t, err.Error(), typederr.Error())
 }
 
@@ -52,7 +52,7 @@ func TestErrextHelpers(t *testing.T) {
 	assertHasHint(t, errBaseWithThreeHints, "best hint (better hint (test hint))")
 
 	finalErrorMess := fmt.Errorf("woot: %w", errBaseWithThreeHints)
-	assert.Equal(t, finalErrorMess.Error(), "woot: wrapper error: base error")
+	assert.Equal(t, "woot: wrapper error: base error", finalErrorMess.Error())
 	assertHasHint(t, finalErrorMess, "best hint (better hint (test hint))")
 	assertHasExitCode(t, finalErrorMess, testExitCode)
 }

examples/grpc_server/go.mod

@@ -1,20 +1,20 @@
 module go.k6.io/k6/examples/grpc_server
 
-go 1.23.0
+go 1.24.0
 
-toolchain go1.23.7
+toolchain go1.24.7
 
 replace go.k6.io/k6 => ../../
 
 require (
 	go.k6.io/k6 v0.0.0-00010101000000-000000000000
-	google.golang.org/grpc v1.72.0
+	google.golang.org/grpc v1.75.0
 )
 
 require (
-	golang.org/x/net v0.40.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.25.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
+	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/text v0.29.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
 )

examples/grpc_server/go.sum

@@ -22,13 +22,21 @@ go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt
 go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
 golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
 golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
 golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a h1:51aaUVRocpvUOSQKM6Q7VuoaktNIaMCLuhZB6DKksq4=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a/go.mod h1:uRxBH1mhmO8PGhU89cMcHaXKZqO+OfakD8QQO0oYwlQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
 google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
+google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
 google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=

internal/cmd/archive_test.go

@@ -171,10 +171,10 @@ func TestArchiveContainsLegacyCloudSettings(t *testing.T) {
 	require.NoError(t, json.Unmarshal(data, &metadata))
 	require.Len(t, metadata.Options.Ext.LoadImpact.Distribution, 2)
 
-	require.Equal(t, metadata.Options.Ext.LoadImpact.Distribution["one"].LoadZone, "amazon:us:ashburn")
-	require.Equal(t, metadata.Options.Ext.LoadImpact.Distribution["one"].Percent, 30.)
-	require.Equal(t, metadata.Options.Ext.LoadImpact.Distribution["two"].LoadZone, "amazon:ie:dublin")
-	require.Equal(t, metadata.Options.Ext.LoadImpact.Distribution["two"].Percent, 70.)
+	require.Equal(t, "amazon:us:ashburn", metadata.Options.Ext.LoadImpact.Distribution["one"].LoadZone)
+	require.Equal(t, 30., metadata.Options.Ext.LoadImpact.Distribution["one"].Percent)
+	require.Equal(t, "amazon:ie:dublin", metadata.Options.Ext.LoadImpact.Distribution["two"].LoadZone)
+	require.Equal(t, 70., metadata.Options.Ext.LoadImpact.Distribution["two"].Percent)
 }
 
 func TestArchiveContainsCloudSettings(t *testing.T) {
@@ -221,10 +221,10 @@ func TestArchiveContainsCloudSettings(t *testing.T) {
 	require.NoError(t, json.Unmarshal(data, &metadata))
 	require.Len(t, metadata.Options.Cloud.Distribution, 2)
 
-	require.Equal(t, metadata.Options.Cloud.Distribution["one"].LoadZone, "amazon:us:ashburn")
-	require.Equal(t, metadata.Options.Cloud.Distribution["one"].Percent, 30.)
-	require.Equal(t, metadata.Options.Cloud.Distribution["two"].LoadZone, "amazon:ie:dublin")
-	require.Equal(t, metadata.Options.Cloud.Distribution["two"].Percent, 70.)
+	require.Equal(t, "amazon:us:ashburn", metadata.Options.Cloud.Distribution["one"].LoadZone)
+	require.Equal(t, 30., metadata.Options.Cloud.Distribution["one"].Percent)
+	require.Equal(t, "amazon:ie:dublin", metadata.Options.Cloud.Distribution["two"].LoadZone)
+	require.Equal(t, 70., metadata.Options.Cloud.Distribution["two"].Percent)
 }
 
 func TestArchiveNotContainsEnv(t *testing.T) {

internal/cmd/config_consolidation_test.go

@@ -182,7 +182,7 @@ func getConfigConsolidationTestCases() []configConsolidationTestCase {
 			verifySharedIters(I(1), I(6))(t, c)
 			sharedIterConfig, ok := c.Scenarios[lib.DefaultScenarioName].(executor.SharedIterationsConfig)
 			require.True(t, ok)
-			assert.Equal(t, sharedIterConfig.MaxDuration.TimeDuration(), 10*time.Second)
+			assert.Equal(t, 10*time.Second, sharedIterConfig.MaxDuration.TimeDuration())
 		}},
 		// This should get a validation error since VUs are more than the shared iterations
 		{opts{cli: []string{"--vus", "10", "-i", "6"}}, exp{validationErrors: true}, verifySharedIters(I(10), I(6))},

internal/cmd/runtime_options_test.go

@@ -102,7 +102,7 @@ func testRuntimeOptionsCase(t *testing.T, tc runtimeOptionsTestCase) {
 	for key, val := range tc.expRTOpts.Env {
 		archTest = getRunnerErr(lib.RuntimeOptions{Env: map[string]string{key: "almost " + val}})
 		require.NoError(t, archTest.initializeFirstRunner(ts.GlobalState))
-		assert.Equal(t, archTest.initRunner.MakeArchive().Env[key], "almost "+val)
+		assert.Equal(t, "almost "+val, archTest.initRunner.MakeArchive().Env[key])
 	}
 }
 

internal/execution/scheduler_int_test.go

@@ -87,6 +87,6 @@ func TestSetPaused(t *testing.T) {
 		sched.executors = []lib.Executor{pausableExecutor{err: expectedErr}}
 		err = sched.SetPaused(true)
 		require.Error(t, err)
-		require.Equal(t, err, expectedErr)
+		require.Equal(t, expectedErr, err)
 	})
 }