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

fix: use `ErrorContains(t, err` instead of `Contains(t, err.Error()`
This commit is contained in:
Kubernetes Prow Robot
2024-09-28 19:18:01 +01:00
committed by GitHub
13 changed files with 21 additions and 20 deletions

View File

@@ -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)
}
})
}

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)
}
}