github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-03 10:16:40 +00:00
Code Issues Projects Releases Wiki Activity

prefer NoError/Error over Nil/NotNil

Browse Source 
Kubernetes-commit: 203679cc6105ea490e75af1efa83497b771d7d36
This commit is contained in:
Stephen Solka 2020-07-18 20:23:35 -04:00 committed by Kubernetes Publisher
parent a32e6027fa
commit 166114c4a0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/fixture_test.go
View File

@ -283,7 +283,7 @@ func TestGetWithExactMatch(t *testing.T) {
constructObject := func(s schema.GroupVersionResource, name, namespace string) (*unstructured.Unstructured, schema.GroupVersionResource) { constructObject := func(s schema.GroupVersionResource, name, namespace string) (*unstructured.Unstructured, schema.GroupVersionResource) {
obj := getArbitraryResource(s, name, namespace) obj := getArbitraryResource(s, name, namespace)
gvks, _, err := scheme.ObjectKinds(obj) gvks, _, err := scheme.ObjectKinds(obj)
assert.Nil(t, err) assert.NoError(t, err)
gvr, _ := meta.UnsafeGuessKindToResource(gvks[0]) gvr, _ := meta.UnsafeGuessKindToResource(gvks[0])
return obj, gvr return obj, gvr
} }
@ -298,11 +298,11 @@ func TestGetWithExactMatch(t *testing.T) {
// Exact match // Exact match
_, err = o.Get(gvr, "", "node") _, err = o.Get(gvr, "", "node")
assert.Nil(t, err) assert.NoError(t, err)
// Unexpected namespace provided // Unexpected namespace provided
_, err = o.Get(gvr, "ns", "node") _, err = o.Get(gvr, "ns", "node")
assert.NotNil(t, err) assert.Error(t, err)
errNotFound := errors.NewNotFound(gvr.GroupResource(), "node") errNotFound := errors.NewNotFound(gvr.GroupResource(), "node")
assert.EqualError(t, err, errNotFound.Error()) assert.EqualError(t, err, errNotFound.Error())
@ -314,11 +314,11 @@ func TestGetWithExactMatch(t *testing.T) {
// Exact match // Exact match
_, err = o.Get(gvr, "default", "pod") _, err = o.Get(gvr, "default", "pod")
assert.Nil(t, err) assert.NoError(t, err)
// Missing namespace // Missing namespace
_, err = o.Get(gvr, "", "pod") _, err = o.Get(gvr, "", "pod")
assert.NotNil(t, err) assert.Error(t, err)
errNotFound = errors.NewNotFound(gvr.GroupResource(), "pod") errNotFound = errors.NewNotFound(gvr.GroupResource(), "pod")
assert.EqualError(t, err, errNotFound.Error()) assert.EqualError(t, err, errNotFound.Error())
} }