kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93214 from trashhalo/prefer-error 

test: prefer NoError/Error over Nil/NotNil

Kubernetes-commit: 09b3f6dbb3224f32d28c81f330f303ac16ee2eae
This commit is contained in:
Kubernetes Publisher 2020-09-16 15:10:45 -07:00
parent db2da9544d 5f7ddf0f68
commit 6f1910367b
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -676,11 +676,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "2f44a17e43a6"
"Rev": "714f1137f89b"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "a32e6027fa67"
"Rev": "cba7285b7f29"
},
{
"ImportPath": "k8s.io/component-base",

8
go.mod
View File

@ -42,8 +42,8 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200914174313-52bf62410745
k8s.io/apimachinery v0.0.0-20200915234101-2f44a17e43a6
k8s.io/client-go v0.0.0-20200915085750-a32e6027fa67
k8s.io/apimachinery v0.0.0-20200916235632-714f1137f89b
k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29
k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
@ -55,7 +55,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20200914174313-52bf62410745
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200915234101-2f44a17e43a6
k8s.io/client-go => k8s.io/client-go v0.0.0-20200915085750-a32e6027fa67
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200916235632-714f1137f89b
k8s.io/client-go => k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29
k8s.io/component-base => k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f
)

4
go.sum
View File

@ -503,8 +503,8 @@ 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-20200915234101-2f44a17e43a6/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/client-go v0.0.0-20200915085750-a32e6027fa67/go.mod h1:l+k6PpRBFWMCiLvf6k6opk7J/clbXd38cNBOo7k6jQg=
k8s.io/apimachinery v0.0.0-20200916235632-714f1137f89b/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29/go.mod h1:Plj2rfLmeMYfAMuMgA/1EGuUaDxt78tvB9yfdi6fg6A=
k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f/go.mod h1:KLUf6+rBAAlh4P5aX9t725mVdFgvY6LfYzl+QOveAV4=
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=

6
pkg/audit/policy/enforce_test.go
View File

@ -82,7 +82,7 @@ func TestEnforcePolicy(t *testing.T) {
objectFuzzer.Fuzz(e)
ev, err := EnforcePolicy(e, tc.level, tc.omitStages)
if omitSet.Has(string(e.Stage)) {
require.Nil(t, err)
require.NoError(t, err)
require.Nil(t, ev)
return
}
@ -136,10 +136,10 @@ func TestEnforcePolicy(t *testing.T) {
expected.Level = tc.level
require.Equal(t, expected, ev)
default:
require.NotNil(t, err)
require.Error(t, err)
return
}
require.Nil(t, err)
require.NoError(t, err)
}
})
}