Merge pull request #104761 from lauchokyip/improveCM

Improve create configmap test
This commit is contained in:
Kubernetes Prow Robot 2021-09-16 16:11:45 -07:00 committed by GitHub
commit ff593c89a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -21,6 +21,8 @@ import (
"os"
"testing"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -441,21 +443,18 @@ func TestCreateConfigMap(t *testing.T) {
}
}
err := configMapOptions.Validate()
if err == nil {
configMap, err = configMapOptions.createConfigMap()
}
if test.expectErr == "" && err != nil {
t.Errorf("unexpected error: %v", err)
}
if test.expectErr != "" && err == nil {
t.Errorf("was expecting an error but no error occurred")
}
if test.expectErr != "" && test.expectErr != err.Error() {
t.Errorf("\nexpected error:\n%s\ngot error:\n%s", test.expectErr, err.Error())
}
if !apiequality.Semantic.DeepEqual(configMap, test.expected) {
t.Errorf("\nexpected:\n%#v\ngot:\n%#v", test.expected, configMap)
if test.expectErr == "" {
require.NoError(t, err)
if !apiequality.Semantic.DeepEqual(configMap, test.expected) {
t.Errorf("\nexpected:\n%#v\ngot:\n%#v", test.expected, configMap)
}
} else {
require.Error(t, err)
require.EqualError(t, err, test.expectErr)
}
})
}