diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 8dc97f05..1e010384 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -448,7 +448,7 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "1173d23fd476" + "Rev": "714f1137f89b" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 6d7ec97e..55a854b6 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 k8s.io/api v0.0.0-20200914174313-52bf62410745 - k8s.io/apimachinery v0.0.0-20200910171558-1173d23fd476 + k8s.io/apimachinery v0.0.0-20200916235632-714f1137f89b k8s.io/klog/v2 v2.2.0 k8s.io/utils v0.0.0-20200729134348-d5654de09c73 sigs.k8s.io/yaml v1.2.0 @@ -35,5 +35,5 @@ require ( replace ( k8s.io/api => k8s.io/api v0.0.0-20200914174313-52bf62410745 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200910171558-1173d23fd476 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200916235632-714f1137f89b ) diff --git a/go.sum b/go.sum index 3de8cf8a..024efdb2 100644 --- a/go.sum +++ b/go.sum @@ -327,7 +327,7 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= k8s.io/api v0.0.0-20200914174313-52bf62410745/go.mod h1:UT3vnXQcd48N6K0IuGGYk1ufh1lolzq+pC4aE2BPvWA= -k8s.io/apimachinery v0.0.0-20200910171558-1173d23fd476/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apimachinery v0.0.0-20200916235632-714f1137f89b/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= diff --git a/testing/fixture_test.go b/testing/fixture_test.go index 912156d3..6e026756 100644 --- a/testing/fixture_test.go +++ b/testing/fixture_test.go @@ -283,7 +283,7 @@ func TestGetWithExactMatch(t *testing.T) { constructObject := func(s schema.GroupVersionResource, name, namespace string) (*unstructured.Unstructured, schema.GroupVersionResource) { obj := getArbitraryResource(s, name, namespace) gvks, _, err := scheme.ObjectKinds(obj) - assert.Nil(t, err) + assert.NoError(t, err) gvr, _ := meta.UnsafeGuessKindToResource(gvks[0]) return obj, gvr } @@ -298,11 +298,11 @@ func TestGetWithExactMatch(t *testing.T) { // Exact match _, err = o.Get(gvr, "", "node") - assert.Nil(t, err) + assert.NoError(t, err) // Unexpected namespace provided _, err = o.Get(gvr, "ns", "node") - assert.NotNil(t, err) + assert.Error(t, err) errNotFound := errors.NewNotFound(gvr.GroupResource(), "node") assert.EqualError(t, err, errNotFound.Error()) @@ -314,11 +314,11 @@ func TestGetWithExactMatch(t *testing.T) { // Exact match _, err = o.Get(gvr, "default", "pod") - assert.Nil(t, err) + assert.NoError(t, err) // Missing namespace _, err = o.Get(gvr, "", "pod") - assert.NotNil(t, err) + assert.Error(t, err) errNotFound = errors.NewNotFound(gvr.GroupResource(), "pod") assert.EqualError(t, err, errNotFound.Error()) }