From 1ce7b0b2fae1c697eccfb019bfc316262d6e428a Mon Sep 17 00:00:00 2001
From: danielqsj <qsj.daniel@gmail.com>
Date: Mon, 25 Feb 2019 17:00:07 +0800
Subject: [PATCH] fix golint failures for test/e2e/ui

---
 hack/.golint_failures    |  1 -
 test/e2e/ui/dashboard.go | 20 ++++++++++----------
 test/e2e/ui/framework.go |  1 +
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hack/.golint_failures b/hack/.golint_failures
index 36e4a37e058..f8a9b11d369 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -672,7 +672,6 @@ test/e2e/storage/drivers
 test/e2e/storage/testsuites
 test/e2e/storage/utils
 test/e2e/storage/vsphere
-test/e2e/ui
 test/e2e/windows
 test/e2e_kubeadm
 test/e2e_node
diff --git a/test/e2e/ui/dashboard.go b/test/e2e/ui/dashboard.go
index f1473324b27..d64bbbf7616 100644
--- a/test/e2e/ui/dashboard.go
+++ b/test/e2e/ui/dashboard.go
@@ -28,12 +28,12 @@ import (
 	"k8s.io/kubernetes/test/e2e/framework"
 	testutils "k8s.io/kubernetes/test/utils"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"github.com/onsi/ginkgo"
+	"github.com/onsi/gomega"
 )
 
 var _ = SIGDescribe("Kubernetes Dashboard", func() {
-	BeforeEach(func() {
+	ginkgo.BeforeEach(func() {
 		// TODO(kubernetes/kubernetes#61559): Enable dashboard here rather than skip the test.
 		framework.SkipIfProviderIs("gke")
 	})
@@ -49,17 +49,17 @@ var _ = SIGDescribe("Kubernetes Dashboard", func() {
 
 	f := framework.NewDefaultFramework(uiServiceName)
 
-	It("should check that the kubernetes-dashboard instance is alive", func() {
-		By("Checking whether the kubernetes-dashboard service exists.")
+	ginkgo.It("should check that the kubernetes-dashboard instance is alive", func() {
+		ginkgo.By("Checking whether the kubernetes-dashboard service exists.")
 		err := framework.WaitForService(f.ClientSet, uiNamespace, uiServiceName, true, framework.Poll, framework.ServiceStartTimeout)
-		Expect(err).NotTo(HaveOccurred())
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
-		By("Checking to make sure the kubernetes-dashboard pods are running")
+		ginkgo.By("Checking to make sure the kubernetes-dashboard pods are running")
 		selector := labels.SelectorFromSet(labels.Set(map[string]string{"k8s-app": uiAppName}))
 		err = testutils.WaitForPodsWithLabelRunning(f.ClientSet, uiNamespace, selector)
-		Expect(err).NotTo(HaveOccurred())
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
-		By("Checking to make sure we get a response from the kubernetes-dashboard.")
+		ginkgo.By("Checking to make sure we get a response from the kubernetes-dashboard.")
 		err = wait.Poll(framework.Poll, serverStartTimeout, func() (bool, error) {
 			var status int
 			proxyRequest, errProxy := framework.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get())
@@ -90,6 +90,6 @@ var _ = SIGDescribe("Kubernetes Dashboard", func() {
 			// Don't return err here as it aborts polling.
 			return status == http.StatusOK, nil
 		})
-		Expect(err).NotTo(HaveOccurred())
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	})
 })
diff --git a/test/e2e/ui/framework.go b/test/e2e/ui/framework.go
index 4cf72e5aa13..930802fdcbb 100644
--- a/test/e2e/ui/framework.go
+++ b/test/e2e/ui/framework.go
@@ -18,6 +18,7 @@ package ui
 
 import "github.com/onsi/ginkgo"
 
+// SIGDescribe annotates the test with the SIG label.
 func SIGDescribe(text string, body func()) bool {
 	return ginkgo.Describe("[sig-ui] "+text, body)
 }