github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87457 from 928234269/fix_staticcheck03

Browse Source 
fix static check errors in test/integration/etcd
This commit is contained in:
Kubernetes Prow Robot 2020-01-22 20:37:47 -08:00 committed by GitHub
commit 4630690eae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -42,7 +42,6 @@ test/e2e/apps
test/e2e/autoscaling test/e2e/autoscaling
test/e2e/instrumentation/logging/stackdriver test/e2e/instrumentation/logging/stackdriver
test/integration/deployment test/integration/deployment
test/integration/etcd
test/integration/examples test/integration/examples
test/integration/framework test/integration/framework
test/integration/garbagecollector test/integration/garbagecollector

6
test/integration/etcd/server.go
View File

@ -135,10 +135,10 @@ func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOp
prepared, err := kubeAPIServer.PrepareRun() prepared, err := kubeAPIServer.PrepareRun()
if err != nil { if err != nil {
t.Fatal(err) t.Error(err)
} }
if err := prepared.Run(stopCh); err != nil { if err := prepared.Run(stopCh); err != nil {
t.Fatal(err) t.Error(err)
} }
}() }()
@ -174,7 +174,7 @@ func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOp
restMapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient) restMapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
restMapper.Reset() restMapper.Reset()
serverResources, err := kubeClient.Discovery().ServerResources() _, serverResources, err := kubeClient.Discovery().ServerGroupsAndResources()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }