Merge pull request kubernetes#76066 from SataQiu/golint-test-20190403

Fix golint failures of e2e/apimachinery

Author: k8s-ci-robot

hack/.golint_failures

@@ -632,7 +632,6 @@ staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder
 staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller
 staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1
 test/e2e
-test/e2e/apimachinery
 test/e2e/apps
 test/e2e/auth
 test/e2e/autoscaling

test/e2e/apimachinery/aggregator.go

@@ -44,7 +44,7 @@ import (
 	samplev1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1"
 	"k8s.io/utils/pointer"
 
-	. "github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo"
 )
 
 var serverAggregatorVersion = utilversion.MustParseSemantic("v1.10.0")
@@ -62,7 +62,7 @@ var _ = SIGDescribe("Aggregator", func() {
 	// We want cleanTest to happen before the namespace cleanup AfterEach
 	// inserted by NewDefaultFramework, so we put this AfterEach in front
 	// of NewDefaultFramework.
-	AfterEach(func() {
+	ginkgo.AfterEach(func() {
 		cleanTest(c, aggrclient, ns)
 	})
 
@@ -71,7 +71,7 @@ var _ = SIGDescribe("Aggregator", func() {
 	// We want namespace initialization BeforeEach inserted by
 	// NewDefaultFramework to happen before this, so we put this BeforeEach
 	// after NewDefaultFramework.
-	BeforeEach(func() {
+	ginkgo.BeforeEach(func() {
 		c = f.ClientSet
 		ns = f.Namespace.Name
 		aggrclient = f.AggregatorClient
@@ -102,10 +102,10 @@ func cleanTest(client clientset.Interface, aggrclient *aggregatorclient.Clientse
 	_ = client.RbacV1beta1().ClusterRoleBindings().Delete("wardler:"+namespace+":sample-apiserver-reader", nil)
 }
 
-// A basic test if the sample-apiserver code from 1.10 and compiled against 1.10
+// TestSampleAPIServer is a basic test if the sample-apiserver code from 1.10 and compiled against 1.10
 // will work on the current Aggregator/API-Server.
 func TestSampleAPIServer(f *framework.Framework, image string) {
-	By("Registering the sample API server.")
+	ginkgo.By("Registering the sample API server.")
 	client := f.ClientSet
 	restClient := client.Discovery().RESTClient()
 	aggrclient := f.AggregatorClient

test/e2e/apimachinery/chunking.go

@@ -23,8 +23,8 @@ import (
 	"reflect"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"github.com/onsi/ginkgo"
+	"github.com/onsi/gomega"
 
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -40,11 +40,11 @@ const numberOfTotalResources = 400
 var _ = SIGDescribe("Servers with support for API chunking", func() {
 	f := framework.NewDefaultFramework("chunking")
 
-	BeforeEach(func() {
+	ginkgo.BeforeEach(func() {
 		ns := f.Namespace.Name
 		c := f.ClientSet
 		client := c.CoreV1().PodTemplates(ns)
-		By("creating a large number of resources")
+		ginkgo.By("creating a large number of resources")
 		workqueue.ParallelizeUntil(context.TODO(), 20, numberOfTotalResources, func(i int) {
 			for tries := 3; tries >= 0; tries-- {
 				_, err := client.Create(&v1.PodTemplate{
@@ -64,65 +64,65 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
 				}
 				framework.Logf("Got an error creating template %d: %v", i, err)
 			}
-			Fail("Unable to create template %d, exiting", i)
+			ginkgo.Fail("Unable to create template %d, exiting", i)
 		})
 	})
 
-	It("should return chunks of results for list calls", func() {
+	ginkgo.It("should return chunks of results for list calls", func() {
 		ns := f.Namespace.Name
 		c := f.ClientSet
 		client := c.CoreV1().PodTemplates(ns)
-		By("retrieving those results in paged fashion several times")
+		ginkgo.By("retrieving those results in paged fashion several times")
 		for i := 0; i < 3; i++ {
 			opts := metav1.ListOptions{}
 			found := 0
 			var lastRV string
 			for {
 				opts.Limit = int64(rand.Int31n(numberOfTotalResources/10) + 1)
 				list, err := client.List(opts)
-				Expect(err).ToNot(HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
+				gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
 				framework.Logf("Retrieved %d/%d results with rv %s and continue %s", len(list.Items), opts.Limit, list.ResourceVersion, list.Continue)
-				Expect(len(list.Items)).To(BeNumerically("<=", opts.Limit))
+				gomega.Expect(len(list.Items)).To(gomega.BeNumerically("<=", opts.Limit))
 
 				if len(lastRV) == 0 {
 					lastRV = list.ResourceVersion
 				}
-				Expect(list.ResourceVersion).To(Equal(lastRV))
+				gomega.Expect(list.ResourceVersion).To(gomega.Equal(lastRV))
 				for _, item := range list.Items {
-					Expect(item.Name).To(Equal(fmt.Sprintf("template-%04d", found)))
+					gomega.Expect(item.Name).To(gomega.Equal(fmt.Sprintf("template-%04d", found)))
 					found++
 				}
 				if len(list.Continue) == 0 {
 					break
 				}
 				opts.Continue = list.Continue
 			}
-			Expect(found).To(BeNumerically("==", numberOfTotalResources))
+			gomega.Expect(found).To(gomega.BeNumerically("==", numberOfTotalResources))
 		}
 
-		By("retrieving those results all at once")
+		ginkgo.By("retrieving those results all at once")
 		opts := metav1.ListOptions{Limit: numberOfTotalResources + 1}
 		list, err := client.List(opts)
-		Expect(err).ToNot(HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
-		Expect(list.Items).To(HaveLen(numberOfTotalResources))
+		gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
+		gomega.Expect(list.Items).To(gomega.HaveLen(numberOfTotalResources))
 	})
 
-	It("should support continue listing from the last key if the original version has been compacted away, though the list is inconsistent", func() {
+	ginkgo.It("should support continue listing from the last key if the original version has been compacted away, though the list is inconsistent", func() {
 		ns := f.Namespace.Name
 		c := f.ClientSet
 		client := c.CoreV1().PodTemplates(ns)
 
-		By("retrieving the first page")
+		ginkgo.By("retrieving the first page")
 		oneTenth := int64(numberOfTotalResources / 10)
 		opts := metav1.ListOptions{}
 		opts.Limit = oneTenth
 		list, err := client.List(opts)
-		Expect(err).ToNot(HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
+		gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
 		firstToken := list.Continue
 		firstRV := list.ResourceVersion
 		framework.Logf("Retrieved %d/%d results with rv %s and continue %s", len(list.Items), opts.Limit, list.ResourceVersion, firstToken)
 
-		By("retrieving the second page until the token expires")
+		ginkgo.By("retrieving the second page until the token expires")
 		opts.Continue = firstToken
 		var inconsistentToken string
 		wait.Poll(20*time.Second, 2*storagebackend.DefaultCompactInterval, func() (bool, error) {
@@ -147,36 +147,36 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
 			return true, nil
 		})
 
-		By("retrieving the second page again with the token received with the error message")
+		ginkgo.By("retrieving the second page again with the token received with the error message")
 		opts.Continue = inconsistentToken
 		list, err = client.List(opts)
-		Expect(err).ToNot(HaveOccurred(), "failed to list pod templates in namespace: %s, given inconsistent continue token %s and limit: %d", ns, opts.Continue, opts.Limit)
-		Expect(list.ResourceVersion).ToNot(Equal(firstRV))
-		Expect(len(list.Items)).To(BeNumerically("==", opts.Limit))
+		gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to list pod templates in namespace: %s, given inconsistent continue token %s and limit: %d", ns, opts.Continue, opts.Limit)
+		gomega.Expect(list.ResourceVersion).ToNot(gomega.Equal(firstRV))
+		gomega.Expect(len(list.Items)).To(gomega.BeNumerically("==", opts.Limit))
 		found := oneTenth
 		for _, item := range list.Items {
-			Expect(item.Name).To(Equal(fmt.Sprintf("template-%04d", found)))
+			gomega.Expect(item.Name).To(gomega.Equal(fmt.Sprintf("template-%04d", found)))
 			found++
 		}
 
-		By("retrieving all remaining pages")
+		ginkgo.By("retrieving all remaining pages")
 		opts.Continue = list.Continue
 		lastRV := list.ResourceVersion
 		for {
 			list, err := client.List(opts)
-			Expect(err).ToNot(HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
+			gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to list pod templates in namespace: %s, given limit: %d", ns, opts.Limit)
 			framework.Logf("Retrieved %d/%d results with rv %s and continue %s", len(list.Items), opts.Limit, list.ResourceVersion, list.Continue)
-			Expect(len(list.Items)).To(BeNumerically("<=", opts.Limit))
-			Expect(list.ResourceVersion).To(Equal(lastRV))
+			gomega.Expect(len(list.Items)).To(gomega.BeNumerically("<=", opts.Limit))
+			gomega.Expect(list.ResourceVersion).To(gomega.Equal(lastRV))
 			for _, item := range list.Items {
-				Expect(item.Name).To(Equal(fmt.Sprintf("template-%04d", found)))
+				gomega.Expect(item.Name).To(gomega.Equal(fmt.Sprintf("template-%04d", found)))
 				found++
 			}
 			if len(list.Continue) == 0 {
 				break
 			}
 			opts.Continue = list.Continue
 		}
-		Expect(found).To(BeNumerically("==", numberOfTotalResources))
+		gomega.Expect(found).To(gomega.BeNumerically("==", numberOfTotalResources))
 	})
 })