Merge pull request kubernetes#127671 from mmorel-35/testify/error-contains

k8s-ci-robot · web-flow · commit e34f7f4d80e6 · 2024-09-28T19:18:01.000+01:00
fix: use `ErrorContains(t, err` instead of `Contains(t, err.Error()`
diff --git a/cmd/gotemplate/gotemplate_test.go b/cmd/gotemplate/gotemplate_test.go
@@ -70,7 +70,7 @@ func TestGenerate(t *testing.T) {
 				require.NoError(t, err, "expand template")
 				require.Equal(t, tt.expected, out.String())
 			} else {
-				require.Contains(t, err.Error(), tt.expectedErr)
+				require.ErrorContains(t, err, tt.expectedErr)
 			}
 		})
 	}
diff --git a/cmd/kube-proxy/app/options_test.go b/cmd/kube-proxy/app/options_test.go
@@ -315,7 +315,7 @@ func TestLoadConfigFailures(t *testing.T) {
 			_, err := options.loadConfig([]byte(config))
 
 			require.Error(t, err, tc.name)
-			require.Contains(t, err.Error(), tc.expErr)
+			require.ErrorContains(t, err, tc.expErr)
 
 			if tc.checkFn != nil {
 				require.True(t, tc.checkFn(err), tc.name)
diff --git a/cmd/kube-scheduler/app/options/options_test.go b/cmd/kube-scheduler/app/options/options_test.go
@@ -933,7 +933,7 @@ profiles:
 			if err != nil {
 				if tc.expectedError != "" || tc.checkErrFn != nil {
 					if tc.expectedError != "" {
-						assert.Contains(t, err.Error(), tc.expectedError)
+						assert.ErrorContains(t, err, tc.expectedError)
 					}
 					if tc.checkErrFn != nil {
 						assert.True(t, tc.checkErrFn(err), "got error: %v", err)
diff --git a/cmd/kubelet/app/server_test.go b/cmd/kubelet/app/server_test.go
@@ -315,7 +315,7 @@ port: 123
 					require.NoError(t, err, "failed to merge kubelet drop-in configs")
 				} else {
 					require.Error(t, err)
-					require.Contains(t, err.Error(), test.expectMergeError)
+					require.ErrorContains(t, err, test.expectMergeError)
 				}
 			}
 
diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go
@@ -362,7 +362,7 @@ func (tc *replicaCalcTestCase) runTest(t *testing.T) {
 
 		if tc.expectedError != nil {
 			require.Error(t, err, "there should be an error calculating the replica count")
-			assert.Contains(t, err.Error(), tc.expectedError.Error(), "the error message should have contained the expected error message")
+			assert.ErrorContains(t, err, tc.expectedError.Error(), "the error message should have contained the expected error message")
 			return
 		}
 		require.NoError(t, err, "there should not have been an error calculating the replica count")
@@ -412,7 +412,7 @@ func (tc *replicaCalcTestCase) runTest(t *testing.T) {
 
 	if tc.expectedError != nil {
 		require.Error(t, err, "there should be an error calculating the replica count")
-		assert.Contains(t, err.Error(), tc.expectedError.Error(), "the error message should have contained the expected error message")
+		assert.ErrorContains(t, err, tc.expectedError.Error(), "the error message should have contained the expected error message")
 		return
 	}
 	require.NoError(t, err, "there should not have been an error calculating the replica count")
diff --git a/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go b/pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
@@ -224,8 +224,8 @@ func TestCheckpointStateRestore(t *testing.T) {
 				require.NoError(t, err)
 			} else {
 				require.Error(t, err)
-				require.Contains(t, err.Error(), "could not restore state from checkpoint")
-				require.Contains(t, err.Error(), tc.expectedError)
+				require.ErrorContains(t, err, "could not restore state from checkpoint")
+				require.ErrorContains(t, err, tc.expectedError)
 				return
 			}
 
diff --git a/pkg/kubelet/cm/dra/manager_test.go b/pkg/kubelet/cm/dra/manager_test.go
@@ -597,7 +597,7 @@ func TestPrepareResources(t *testing.T) {
 			if test.expectedErrMsg != "" {
 				assert.Error(t, err)
 				if err != nil {
-					assert.Contains(t, err.Error(), test.expectedErrMsg)
+					assert.ErrorContains(t, err, test.expectedErrMsg)
 				}
 				return // PrepareResources returned an error so stopping the test case here
 			}
@@ -739,7 +739,7 @@ func TestUnprepareResources(t *testing.T) {
 			if test.expectedErrMsg != "" {
 				assert.Error(t, err)
 				if err != nil {
-					assert.Contains(t, err.Error(), test.expectedErrMsg)
+					assert.ErrorContains(t, err, test.expectedErrMsg)
 				}
 				return // PrepareResources returned an error so stopping the test case here
 			}
@@ -863,7 +863,7 @@ func TestGetContainerClaimInfos(t *testing.T) {
 			if test.expectedErrMsg != "" {
 				assert.Error(t, err)
 				if err != nil {
-					assert.Contains(t, err.Error(), test.expectedErrMsg)
+					assert.ErrorContains(t, err, test.expectedErrMsg)
 				}
 				return
 			}
diff --git a/pkg/kubelet/cm/memorymanager/state/state_checkpoint_test.go b/pkg/kubelet/cm/memorymanager/state/state_checkpoint_test.go
@@ -134,7 +134,7 @@ func TestCheckpointStateRestore(t *testing.T) {
 			restoredState, err := NewCheckpointState(testingDir, testingCheckpoint, "static")
 			if strings.TrimSpace(tc.expectedError) != "" {
 				assert.Error(t, err)
-				assert.Contains(t, err.Error(), "could not restore state from checkpoint: "+tc.expectedError)
+				assert.ErrorContains(t, err, "could not restore state from checkpoint: "+tc.expectedError)
 			} else {
 				assert.NoError(t, err, "unexpected error while creating checkpointState")
 				// compare state after restoration with the one expected
diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container_linux_test.go b/pkg/kubelet/kuberuntime/kuberuntime_container_linux_test.go
@@ -780,7 +780,7 @@ func TestGenerateLinuxConfigSupplementalGroupsPolicy(t *testing.T) {
 			} else {
 				assert.NotEmpty(t, err, "Unexpected success")
 				assert.Empty(t, actual, "Unexpected non empty value")
-				assert.Contains(t, err.Error(), tc.expectedErrMsg, "Error for %s", tc.name)
+				assert.ErrorContainsf(t, err, tc.expectedErrMsg, "Error for %s", tc.name)
 			}
 		})
 	}
diff --git a/pkg/kubelet/volumemanager/reconciler/reconciler_test.go b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go
@@ -1142,7 +1142,7 @@ func Test_GenerateMapVolumeFunc_Plugin_Not_Found(t *testing.T) {
 			err := oex.MountVolume(waitForAttachTimeout, volumeToMount, asw, false)
 			// Assert
 			if assert.Error(t, err) {
-				assert.Contains(t, err.Error(), tc.expectedErrMsg)
+				assert.ErrorContains(t, err, tc.expectedErrMsg)
 			}
 		})
 	}
@@ -1184,7 +1184,7 @@ func Test_GenerateUnmapVolumeFunc_Plugin_Not_Found(t *testing.T) {
 			err := oex.UnmountVolume(volumeToUnmount, asw, "" /* podsDir */)
 			// Assert
 			if assert.Error(t, err) {
-				assert.Contains(t, err.Error(), tc.expectedErrMsg)
+				assert.ErrorContains(t, err, tc.expectedErrMsg)
 			}
 		})
 	}
@@ -1225,7 +1225,7 @@ func Test_GenerateUnmapDeviceFunc_Plugin_Not_Found(t *testing.T) {
 			err := oex.UnmountDevice(deviceToDetach, asw, hostutil)
 			// Assert
 			if assert.Error(t, err) {
-				assert.Contains(t, err.Error(), tc.expectedErrMsg)
+				assert.ErrorContains(t, err, tc.expectedErrMsg)
 			}
 		})
 	}
diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go
@@ -124,7 +124,7 @@ func TestInternalVersionIsHandlerVersion(t *testing.T) {
 				return false, nil
 			}
 
-			assert.Contains(t, err.Error(), "apiVersion")
+			assert.ErrorContains(t, err, "apiVersion")
 			return true, nil
 		})
 		assert.NoError(t, err)
diff --git a/staging/src/k8s.io/apiserver/pkg/audit/policy/reader_test.go b/staging/src/k8s.io/apiserver/pkg/audit/policy/reader_test.go
@@ -123,7 +123,7 @@ func TestParsePolicyWithNoVersionOrKind(t *testing.T) {
 	defer os.Remove(f)
 
 	_, err = LoadPolicyFromFile(f)
-	assert.Contains(t, err.Error(), "unknown group version field")
+	assert.ErrorContains(t, err, "unknown group version field")
 }
 
 func TestParsePolicyWithUnknownField(t *testing.T) {
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event_test.go
@@ -17,11 +17,12 @@ limitations under the License.
 package etcd3
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
-	"testing"
 )
 
 func TestParseEvent(t *testing.T) {
@@ -100,7 +101,7 @@ func TestParseEvent(t *testing.T) {
 			actualEvent, err := parseEvent(tc.etcdEvent)
 			if tc.expectedErr != "" {
 				require.Error(t, err)
-				assert.Contains(t, err.Error(), tc.expectedErr)
+				assert.ErrorContains(t, err, tc.expectedErr)
 			} else {
 				require.NoError(t, err)
 				assert.Equal(t, tc.expectedEvent, actualEvent)

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func TestGenerate(t *testing.T) {`
`70`	`70`	`require.NoError(t, err, "expand template")`
`71`	`71`	`require.Equal(t, tt.expected, out.String())`
`72`	`72`	`} else {`
`73`		`- require.Contains(t, err.Error(), tt.expectedErr)`
	`73`	`+ require.ErrorContains(t, err, tt.expectedErr)`
`74`	`74`	`}`
`75`	`75`	`})`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -933,7 +933,7 @@ profiles:`
`933`	`933`	`if err != nil {`
`934`	`934`	`if tc.expectedError != "" \|\| tc.checkErrFn != nil {`
`935`	`935`	`if tc.expectedError != "" {`
`936`		`- assert.Contains(t, err.Error(), tc.expectedError)`
	`936`	`+ assert.ErrorContains(t, err, tc.expectedError)`
`937`	`937`	`}`
`938`	`938`	`if tc.checkErrFn != nil {`
`939`	`939`	`assert.True(t, tc.checkErrFn(err), "got error: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ port: 123`
`315`	`315`	`require.NoError(t, err, "failed to merge kubelet drop-in configs")`
`316`	`316`	`} else {`
`317`	`317`	`require.Error(t, err)`
`318`		`- require.Contains(t, err.Error(), test.expectMergeError)`
	`318`	`+ require.ErrorContains(t, err, test.expectMergeError)`
`319`	`319`	`}`
`320`	`320`	`}`
`321`	`321`
Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,7 @@ func TestPrepareResources(t *testing.T) {`
`597`	`597`	`if test.expectedErrMsg != "" {`
`598`	`598`	`assert.Error(t, err)`
`599`	`599`	`if err != nil {`
`600`		`- assert.Contains(t, err.Error(), test.expectedErrMsg)`
	`600`	`+ assert.ErrorContains(t, err, test.expectedErrMsg)`
`601`	`601`	`}`
`602`	`602`	`return // PrepareResources returned an error so stopping the test case here`
`603`	`603`	`}`
`@@ -739,7 +739,7 @@ func TestUnprepareResources(t *testing.T) {`
`739`	`739`	`if test.expectedErrMsg != "" {`
`740`	`740`	`assert.Error(t, err)`
`741`	`741`	`if err != nil {`
`742`		`- assert.Contains(t, err.Error(), test.expectedErrMsg)`
	`742`	`+ assert.ErrorContains(t, err, test.expectedErrMsg)`
`743`	`743`	`}`
`744`	`744`	`return // PrepareResources returned an error so stopping the test case here`
`745`	`745`	`}`
`@@ -863,7 +863,7 @@ func TestGetContainerClaimInfos(t *testing.T) {`
`863`	`863`	`if test.expectedErrMsg != "" {`
`864`	`864`	`assert.Error(t, err)`
`865`	`865`	`if err != nil {`
`866`		`- assert.Contains(t, err.Error(), test.expectedErrMsg)`
	`866`	`+ assert.ErrorContains(t, err, test.expectedErrMsg)`
`867`	`867`	`}`
`868`	`868`	`return`
`869`	`869`	`}`
Original file line number	Diff line number	Diff line change
`@@ -780,7 +780,7 @@ func TestGenerateLinuxConfigSupplementalGroupsPolicy(t *testing.T) {`
`780`	`780`	`} else {`
`781`	`781`	`assert.NotEmpty(t, err, "Unexpected success")`
`782`	`782`	`assert.Empty(t, actual, "Unexpected non empty value")`
`783`		`- assert.Contains(t, err.Error(), tc.expectedErrMsg, "Error for %s", tc.name)`
	`783`	`+ assert.ErrorContainsf(t, err, tc.expectedErrMsg, "Error for %s", tc.name)`
`784`	`784`	`}`
`785`	`785`	`})`
`786`	`786`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1142,7 +1142,7 @@ func Test_GenerateMapVolumeFunc_Plugin_Not_Found(t *testing.T) {`
`1142`	`1142`	`err := oex.MountVolume(waitForAttachTimeout, volumeToMount, asw, false)`
`1143`	`1143`	`// Assert`
`1144`	`1144`	`if assert.Error(t, err) {`
`1145`		`- assert.Contains(t, err.Error(), tc.expectedErrMsg)`
	`1145`	`+ assert.ErrorContains(t, err, tc.expectedErrMsg)`
`1146`	`1146`	`}`
`1147`	`1147`	`})`
`1148`	`1148`	`}`
`@@ -1184,7 +1184,7 @@ func Test_GenerateUnmapVolumeFunc_Plugin_Not_Found(t *testing.T) {`
`1184`	`1184`	`err := oex.UnmountVolume(volumeToUnmount, asw, "" /* podsDir */)`
`1185`	`1185`	`// Assert`
`1186`	`1186`	`if assert.Error(t, err) {`
`1187`		`- assert.Contains(t, err.Error(), tc.expectedErrMsg)`
	`1187`	`+ assert.ErrorContains(t, err, tc.expectedErrMsg)`
`1188`	`1188`	`}`
`1189`	`1189`	`})`
`1190`	`1190`	`}`
`@@ -1225,7 +1225,7 @@ func Test_GenerateUnmapDeviceFunc_Plugin_Not_Found(t *testing.T) {`
`1225`	`1225`	`err := oex.UnmountDevice(deviceToDetach, asw, hostutil)`
`1226`	`1226`	`// Assert`
`1227`	`1227`	`if assert.Error(t, err) {`
`1228`		`- assert.Contains(t, err.Error(), tc.expectedErrMsg)`
	`1228`	`+ assert.ErrorContains(t, err, tc.expectedErrMsg)`
`1229`	`1229`	`}`
`1230`	`1230`	`})`
`1231`	`1231`	`}`