github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

fix golint failures for test/e2e/cloud

Browse Source
This commit is contained in:
danielqsj 2019-02-26 16:48:22 +08:00
parent 0d98463f9c
commit 84aeafee7b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

@ -650,7 +650,6 @@ test/e2e/apps
test/e2e/auth test/e2e/auth
test/e2e/autoscaling test/e2e/autoscaling
test/e2e/chaosmonkey test/e2e/chaosmonkey
test/e2e/cloud
test/e2e/common test/e2e/common
test/e2e/framework test/e2e/framework
test/e2e/framework/ingress test/e2e/framework/ingress

1
test/e2e/cloud/framework.go
View File

@ -18,6 +18,7 @@ package cloud
import "k8s.io/kubernetes/test/e2e/framework" import "k8s.io/kubernetes/test/e2e/framework"
// SIGDescribe annotates the test with the SIG label.
func SIGDescribe(text string, body func()) bool { func SIGDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-cloud-provider] "+text, body) return framework.KubeDescribe("[sig-cloud-provider] "+text, body)
} }

14
test/e2e/cloud/nodes.go
View File

@ -24,23 +24,23 @@ import (
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
. "github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" "github.com/onsi/gomega"
) )
var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() { var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() {
f := framework.NewDefaultFramework("cloudprovider") f := framework.NewDefaultFramework("cloudprovider")
var c clientset.Interface var c clientset.Interface
BeforeEach(func() { ginkgo.BeforeEach(func() {
// Only supported in AWS/GCE because those are the only cloud providers // Only supported in AWS/GCE because those are the only cloud providers
// where E2E test are currently running. // where E2E test are currently running.
framework.SkipUnlessProviderIs("aws", "gce", "gke") framework.SkipUnlessProviderIs("aws", "gce", "gke")
c = f.ClientSet c = f.ClientSet
}) })
It("should be deleted on API server if it doesn't exist in the cloud provider", func() { ginkgo.It("should be deleted on API server if it doesn't exist in the cloud provider", func() {
By("deleting a node on the cloud provider") ginkgo.By("deleting a node on the cloud provider")
nodeDeleteCandidates := framework.GetReadySchedulableNodesOrDie(c) nodeDeleteCandidates := framework.GetReadySchedulableNodesOrDie(c)
nodeToDelete := nodeDeleteCandidates.Items[0] nodeToDelete := nodeDeleteCandidates.Items[0]
@ -54,8 +54,8 @@ var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() {
} }
newNodes, err := framework.CheckNodesReady(c, len(origNodes.Items)-1, 5*time.Minute) newNodes, err := framework.CheckNodesReady(c, len(origNodes.Items)-1, 5*time.Minute)
Expect(err).To(BeNil()) gomega.Expect(err).To(gomega.BeNil())
Expect(len(newNodes)).To(Equal(len(origNodes.Items) - 1)) gomega.Expect(len(newNodes)).To(gomega.Equal(len(origNodes.Items) - 1))
_, err = c.CoreV1().Nodes().Get(nodeToDelete.Name, metav1.GetOptions{}) _, err = c.CoreV1().Nodes().Get(nodeToDelete.Name, metav1.GetOptions{})
if err == nil { if err == nil {