github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
commit e34f7f4d80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/gotemplate/gotemplate_test.go
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)
}
})
}

2
cmd/kube-proxy/app/options_test.go
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)

2
cmd/kube-scheduler/app/options/options_test.go
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)

2
cmd/kubelet/app/server_test.go
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)
}
}

4
pkg/controller/podautoscaler/replica_calculator_test.go
View File

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

4
pkg/kubelet/cm/cpumanager/state/state_checkpoint_test.go
View File

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

6
pkg/kubelet/cm/dra/manager_test.go
View File

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

2
pkg/kubelet/cm/memorymanager/state/state_checkpoint_test.go
View File

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

2
pkg/kubelet/kuberuntime/kuberuntime_container_linux_test.go
View File

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

6
pkg/kubelet/volumemanager/reconciler/reconciler_test.go
View File

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

2
staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go
View File

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

2
staging/src/k8s.io/apiserver/pkg/audit/policy/reader_test.go
View File

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

5
staging/src/k8s.io/apiserver/pkg/storage/etcd3/event_test.go
View File

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