Skip to content

Commit 73c83a8

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#77668 from SataQiu/fix-golint-test-20190509
Fix golint failures of test/e2e/network
2 parents b03367b + 515f834 commit 73c83a8

20 files changed

+858
-859
lines changed

‎hack/.golint_failures‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,6 @@ test/e2e/chaosmonkey
606606
test/e2e/common
607607
test/e2e/framework
608608
test/e2e/lifecycle/bootstrap
609-
test/e2e/network
610609
test/e2e/node
611610
test/e2e/scalability
612611
test/e2e/scheduling

‎test/e2e/network/dns.go‎

Lines changed: 90 additions & 90 deletions
Large diffs are not rendered by default.

‎test/e2e/network/dns_common.go‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3636
imageutils "k8s.io/kubernetes/test/utils/image"
3737

38-
. "github.com/onsi/ginkgo"
39-
. "github.com/onsi/gomega"
38+
"github.com/onsi/ginkgo"
39+
"github.com/onsi/gomega"
4040
)
4141

4242
type dnsTestCommon struct {
@@ -62,14 +62,14 @@ func newDNSTestCommon() dnsTestCommon {
6262
}
6363

6464
func (t *dnsTestCommon) init() {
65-
By("Finding a DNS pod")
65+
ginkgo.By("Finding a DNS pod")
6666
label := labels.SelectorFromSet(labels.Set(map[string]string{"k8s-app": "kube-dns"}))
6767
options := metav1.ListOptions{LabelSelector: label.String()}
6868

6969
namespace := "kube-system"
7070
pods, err := t.f.ClientSet.CoreV1().Pods(namespace).List(options)
71-
Expect(err).NotTo(HaveOccurred(), "failed to list pods in namespace: %s", namespace)
72-
Expect(len(pods.Items)).Should(BeNumerically(">=", 1))
71+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to list pods in namespace: %s", namespace)
72+
gomega.Expect(len(pods.Items)).Should(gomega.BeNumerically(">=", 1))
7373

7474
t.dnsPod = &pods.Items[0]
7575
e2elog.Logf("Using DNS pod: %v", t.dnsPod.Name)
@@ -157,23 +157,23 @@ func (t *dnsTestCommon) setConfigMap(cm *v1.ConfigMap) {
157157
}.AsSelector().String(),
158158
}
159159
cmList, err := t.c.CoreV1().ConfigMaps(t.ns).List(options)
160-
Expect(err).NotTo(HaveOccurred(), "failed to list ConfigMaps in namespace: %s", t.ns)
160+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to list ConfigMaps in namespace: %s", t.ns)
161161

162162
if len(cmList.Items) == 0 {
163-
By(fmt.Sprintf("Creating the ConfigMap (%s:%s) %+v", t.ns, t.name, *cm))
163+
ginkgo.By(fmt.Sprintf("Creating the ConfigMap (%s:%s) %+v", t.ns, t.name, *cm))
164164
_, err := t.c.CoreV1().ConfigMaps(t.ns).Create(cm)
165-
Expect(err).NotTo(HaveOccurred(), "failed to create ConfigMap (%s:%s) %+v", t.ns, t.name, *cm)
165+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to create ConfigMap (%s:%s) %+v", t.ns, t.name, *cm)
166166
} else {
167-
By(fmt.Sprintf("Updating the ConfigMap (%s:%s) to %+v", t.ns, t.name, *cm))
167+
ginkgo.By(fmt.Sprintf("Updating the ConfigMap (%s:%s) to %+v", t.ns, t.name, *cm))
168168
_, err := t.c.CoreV1().ConfigMaps(t.ns).Update(cm)
169-
Expect(err).NotTo(HaveOccurred(), "failed to update ConfigMap (%s:%s) to %+v", t.ns, t.name, *cm)
169+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to update ConfigMap (%s:%s) to %+v", t.ns, t.name, *cm)
170170
}
171171
}
172172

173173
func (t *dnsTestCommon) fetchDNSConfigMapData() map[string]string {
174174
if t.name == "coredns" {
175175
pcm, err := t.c.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(t.name, metav1.GetOptions{})
176-
Expect(err).NotTo(HaveOccurred(), "failed to get DNS ConfigMap: %s", t.name)
176+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to get DNS ConfigMap: %s", t.name)
177177
return pcm.Data
178178
}
179179
return nil
@@ -189,10 +189,10 @@ func (t *dnsTestCommon) restoreDNSConfigMap(configMapData map[string]string) {
189189
}
190190

191191
func (t *dnsTestCommon) deleteConfigMap() {
192-
By(fmt.Sprintf("Deleting the ConfigMap (%s:%s)", t.ns, t.name))
192+
ginkgo.By(fmt.Sprintf("Deleting the ConfigMap (%s:%s)", t.ns, t.name))
193193
t.cm = nil
194194
err := t.c.CoreV1().ConfigMaps(t.ns).Delete(t.name, nil)
195-
Expect(err).NotTo(HaveOccurred(), "failed to delete config map: %s", t.name)
195+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to delete config map: %s", t.name)
196196
}
197197

198198
func (t *dnsTestCommon) createUtilPodLabel(baseName string) {
@@ -224,9 +224,9 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) {
224224

225225
var err error
226226
t.utilPod, err = t.c.CoreV1().Pods(t.f.Namespace.Name).Create(t.utilPod)
227-
Expect(err).NotTo(HaveOccurred(), "failed to create pod: %v", t.utilPod)
227+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to create pod: %v", t.utilPod)
228228
e2elog.Logf("Created pod %v", t.utilPod)
229-
Expect(t.f.WaitForPodRunning(t.utilPod.Name)).NotTo(HaveOccurred(), "pod failed to start running: %v", t.utilPod)
229+
gomega.Expect(t.f.WaitForPodRunning(t.utilPod.Name)).NotTo(gomega.HaveOccurred(), "pod failed to start running: %v", t.utilPod)
230230

231231
t.utilService = &v1.Service{
232232
TypeMeta: metav1.TypeMeta{
@@ -249,7 +249,7 @@ func (t *dnsTestCommon) createUtilPodLabel(baseName string) {
249249
}
250250

251251
t.utilService, err = t.c.CoreV1().Services(t.f.Namespace.Name).Create(t.utilService)
252-
Expect(err).NotTo(HaveOccurred(), "failed to create service: %s/%s", t.f.Namespace.Name, t.utilService.ObjectMeta.Name)
252+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to create service: %s/%s", t.f.Namespace.Name, t.utilService.ObjectMeta.Name)
253253
e2elog.Logf("Created service %v", t.utilService)
254254
}
255255

@@ -272,7 +272,7 @@ func (t *dnsTestCommon) deleteCoreDNSPods() {
272272

273273
for _, pod := range pods.Items {
274274
err = podClient.Delete(pod.Name, metav1.NewDeleteOptions(0))
275-
Expect(err).NotTo(HaveOccurred(), "failed to delete pod: %s", pod.Name)
275+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to delete pod: %s", pod.Name)
276276
}
277277
}
278278

@@ -315,13 +315,13 @@ func (t *dnsTestCommon) createDNSPodFromObj(pod *v1.Pod) {
315315

316316
var err error
317317
t.dnsServerPod, err = t.c.CoreV1().Pods(t.f.Namespace.Name).Create(t.dnsServerPod)
318-
Expect(err).NotTo(HaveOccurred(), "failed to create pod: %v", t.dnsServerPod)
318+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to create pod: %v", t.dnsServerPod)
319319
e2elog.Logf("Created pod %v", t.dnsServerPod)
320-
Expect(t.f.WaitForPodRunning(t.dnsServerPod.Name)).NotTo(HaveOccurred(), "pod failed to start running: %v", t.dnsServerPod)
320+
gomega.Expect(t.f.WaitForPodRunning(t.dnsServerPod.Name)).NotTo(gomega.HaveOccurred(), "pod failed to start running: %v", t.dnsServerPod)
321321

322322
t.dnsServerPod, err = t.c.CoreV1().Pods(t.f.Namespace.Name).Get(
323323
t.dnsServerPod.Name, metav1.GetOptions{})
324-
Expect(err).NotTo(HaveOccurred(), "failed to get pod: %s", t.dnsServerPod.Name)
324+
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "failed to get pod: %s", t.dnsServerPod.Name)
325325
}
326326

327327
func (t *dnsTestCommon) createDNSServer(aRecords map[string]string) {
@@ -539,30 +539,30 @@ func assertFilesContain(fileNames []string, fileDir string, pod *v1.Pod, client
539539
e2elog.Logf("Lookups using %s/%s failed for: %v\n", pod.Namespace, pod.Name, failed)
540540
return false, nil
541541
}))
542-
Expect(len(failed)).To(Equal(0))
542+
gomega.Expect(len(failed)).To(gomega.Equal(0))
543543
}
544544

545545
func validateDNSResults(f *framework.Framework, pod *v1.Pod, fileNames []string) {
546-
By("submitting the pod to kubernetes")
546+
ginkgo.By("submitting the pod to kubernetes")
547547
podClient := f.ClientSet.CoreV1().Pods(f.Namespace.Name)
548548
defer func() {
549-
By("deleting the pod")
550-
defer GinkgoRecover()
549+
ginkgo.By("deleting the pod")
550+
defer ginkgo.GinkgoRecover()
551551
podClient.Delete(pod.Name, metav1.NewDeleteOptions(0))
552552
}()
553553
if _, err := podClient.Create(pod); err != nil {
554-
framework.Failf("Failed to create pod %s/%s: %v", pod.Namespace, pod.Name, err)
554+
framework.Failf("ginkgo.Failed to create pod %s/%s: %v", pod.Namespace, pod.Name, err)
555555
}
556556

557557
framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
558558

559-
By("retrieving the pod")
559+
ginkgo.By("retrieving the pod")
560560
pod, err := podClient.Get(pod.Name, metav1.GetOptions{})
561561
if err != nil {
562-
framework.Failf("Failed to get pod %s/%s: %v", pod.Namespace, pod.Name, err)
562+
framework.Failf("ginkgo.Failed to get pod %s/%s: %v", pod.Namespace, pod.Name, err)
563563
}
564564
// Try to find results for each expected name.
565-
By("looking for the results for each expected name from probers")
565+
ginkgo.By("looking for the results for each expected name from probers")
566566
assertFilesExist(fileNames, "results", pod, f.ClientSet)
567567

568568
// TODO: probe from the host, too.
@@ -571,26 +571,26 @@ func validateDNSResults(f *framework.Framework, pod *v1.Pod, fileNames []string)
571571
}
572572

573573
func validateTargetedProbeOutput(f *framework.Framework, pod *v1.Pod, fileNames []string, value string) {
574-
By("submitting the pod to kubernetes")
574+
ginkgo.By("submitting the pod to kubernetes")
575575
podClient := f.ClientSet.CoreV1().Pods(f.Namespace.Name)
576576
defer func() {
577-
By("deleting the pod")
578-
defer GinkgoRecover()
577+
ginkgo.By("deleting the pod")
578+
defer ginkgo.GinkgoRecover()
579579
podClient.Delete(pod.Name, metav1.NewDeleteOptions(0))
580580
}()
581581
if _, err := podClient.Create(pod); err != nil {
582-
framework.Failf("Failed to create pod %s/%s: %v", pod.Namespace, pod.Name, err)
582+
framework.Failf("ginkgo.Failed to create pod %s/%s: %v", pod.Namespace, pod.Name, err)
583583
}
584584

585585
framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
586586

587-
By("retrieving the pod")
587+
ginkgo.By("retrieving the pod")
588588
pod, err := podClient.Get(pod.Name, metav1.GetOptions{})
589589
if err != nil {
590-
framework.Failf("Failed to get pod %s/%s: %v", pod.Namespace, pod.Name, err)
590+
framework.Failf("ginkgo.Failed to get pod %s/%s: %v", pod.Namespace, pod.Name, err)
591591
}
592592
// Try to find the expected value for each expected name.
593-
By("looking for the results for each expected name from probers")
593+
ginkgo.By("looking for the results for each expected name from probers")
594594
assertFilesContain(fileNames, "results", pod, f.ClientSet, true, value)
595595

596596
e2elog.Logf("DNS probes using %s succeeded\n", pod.Name)

‎test/e2e/network/dns_configmap.go‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/util/wait"
2525
"k8s.io/kubernetes/test/e2e/framework"
2626

27-
. "github.com/onsi/ginkgo"
27+
"github.com/onsi/ginkgo"
2828
)
2929

3030
type dnsFederationsConfigMapTest struct {
@@ -45,7 +45,7 @@ var _ = SIGDescribe("DNS configMap federations [Feature:Federation]", func() {
4545

4646
t := &dnsFederationsConfigMapTest{dnsTestCommon: newDNSTestCommon()}
4747

48-
It("should be able to change federation configuration [Slow][Serial]", func() {
48+
ginkgo.It("should be able to change federation configuration [Slow][Serial]", func() {
4949
t.c = t.f.ClientSet
5050
t.run()
5151
})
@@ -96,17 +96,17 @@ func (t *dnsFederationsConfigMapTest) run() {
9696
}`, framework.TestContext.ClusterDNSDomain, framework.TestContext.ClusterDNSDomain)}
9797
valid2m := map[string]string{t.labels[1]: "xyz.com"}
9898

99-
By("default -> valid1")
99+
ginkgo.By("default -> valid1")
100100
t.setConfigMap(&v1.ConfigMap{Data: valid1}, valid1m, true)
101101
t.deleteCoreDNSPods()
102102
t.validate(framework.TestContext.ClusterDNSDomain)
103103

104-
By("valid1 -> valid2")
104+
ginkgo.By("valid1 -> valid2")
105105
t.setConfigMap(&v1.ConfigMap{Data: valid2}, valid2m, true)
106106
t.deleteCoreDNSPods()
107107
t.validate(framework.TestContext.ClusterDNSDomain)
108108

109-
By("valid2 -> default")
109+
ginkgo.By("valid2 -> default")
110110
t.setConfigMap(&v1.ConfigMap{Data: originalConfigMapData}, nil, false)
111111
t.deleteCoreDNSPods()
112112
t.validate(framework.TestContext.ClusterDNSDomain)
@@ -121,27 +121,27 @@ func (t *dnsFederationsConfigMapTest) run() {
121121
valid2m := map[string]string{t.labels[1]: "xyz"}
122122
invalid := map[string]string{"federations": "invalid.map=xyz"}
123123

124-
By("empty -> valid1")
124+
ginkgo.By("empty -> valid1")
125125
t.setConfigMap(&v1.ConfigMap{Data: valid1}, valid1m, true)
126126
t.validate(framework.TestContext.ClusterDNSDomain)
127127

128-
By("valid1 -> valid2")
128+
ginkgo.By("valid1 -> valid2")
129129
t.setConfigMap(&v1.ConfigMap{Data: valid2}, valid2m, true)
130130
t.validate(framework.TestContext.ClusterDNSDomain)
131131

132-
By("valid2 -> invalid")
132+
ginkgo.By("valid2 -> invalid")
133133
t.setConfigMap(&v1.ConfigMap{Data: invalid}, nil, false)
134134
t.validate(framework.TestContext.ClusterDNSDomain)
135135

136-
By("invalid -> valid1")
136+
ginkgo.By("invalid -> valid1")
137137
t.setConfigMap(&v1.ConfigMap{Data: valid1}, valid1m, true)
138138
t.validate(framework.TestContext.ClusterDNSDomain)
139139

140-
By("valid1 -> deleted")
140+
ginkgo.By("valid1 -> deleted")
141141
t.deleteConfigMap()
142142
t.validate(framework.TestContext.ClusterDNSDomain)
143143

144-
By("deleted -> invalid")
144+
ginkgo.By("deleted -> invalid")
145145
t.setConfigMap(&v1.ConfigMap{Data: invalid}, nil, false)
146146
t.validate(framework.TestContext.ClusterDNSDomain)
147147
}
@@ -151,7 +151,7 @@ func (t *dnsFederationsConfigMapTest) validate(dnsDomain string) {
151151
federations := t.fedMap
152152

153153
if len(federations) == 0 {
154-
By(fmt.Sprintf("Validating federation labels %v do not exist", t.labels))
154+
ginkgo.By(fmt.Sprintf("Validating federation labels %v do not exist", t.labels))
155155

156156
for _, label := range t.labels {
157157
var federationDNS = fmt.Sprintf("e2e-dns-configmap.%s.%s.svc.%s.",
@@ -173,7 +173,7 @@ func (t *dnsFederationsConfigMapTest) validate(dnsDomain string) {
173173
// Check local mapping. Checking a remote mapping requires
174174
// creating an arbitrary DNS record which is not possible at the
175175
// moment.
176-
By(fmt.Sprintf("Validating federation record %v", label))
176+
ginkgo.By(fmt.Sprintf("Validating federation record %v", label))
177177
predicate := func(actual []string) bool {
178178
for _, v := range actual {
179179
if v == localDNS {
@@ -407,16 +407,16 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
407407
serviceName := "dns-externalname-upstream-test"
408408
externalNameService := framework.CreateServiceSpec(serviceName, googleDNSHostname, false, nil)
409409
if _, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(externalNameService); err != nil {
410-
Fail(fmt.Sprintf("Failed when creating service: %v", err))
410+
ginkgo.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err))
411411
}
412412
serviceNameLocal := "dns-externalname-upstream-local"
413413
externalNameServiceLocal := framework.CreateServiceSpec(serviceNameLocal, fooHostname, false, nil)
414414
if _, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(externalNameServiceLocal); err != nil {
415-
Fail(fmt.Sprintf("Failed when creating service: %v", err))
415+
ginkgo.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err))
416416
}
417417
defer func() {
418-
By("deleting the test externalName service")
419-
defer GinkgoRecover()
418+
ginkgo.By("deleting the test externalName service")
419+
defer ginkgo.GinkgoRecover()
420420
f.ClientSet.CoreV1().Services(f.Namespace.Name).Delete(externalNameService.Name, nil)
421421
f.ClientSet.CoreV1().Services(f.Namespace.Name).Delete(externalNameServiceLocal.Name, nil)
422422
}()
@@ -482,28 +482,28 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
482482

483483
var _ = SIGDescribe("DNS configMap nameserver [IPv4]", func() {
484484

485-
Context("Change stubDomain", func() {
485+
ginkgo.Context("Change stubDomain", func() {
486486
nsTest := &dnsNameserverTest{dnsTestCommon: newDNSTestCommon()}
487487

488-
It("should be able to change stubDomain configuration [Slow][Serial]", func() {
488+
ginkgo.It("should be able to change stubDomain configuration [Slow][Serial]", func() {
489489
nsTest.c = nsTest.f.ClientSet
490490
nsTest.run(false)
491491
})
492492
})
493493

494-
Context("Forward PTR lookup", func() {
494+
ginkgo.Context("Forward PTR lookup", func() {
495495
fwdTest := &dnsPtrFwdTest{dnsTestCommon: newDNSTestCommon()}
496496

497-
It("should forward PTR records lookup to upstream nameserver [Slow][Serial]", func() {
497+
ginkgo.It("should forward PTR records lookup to upstream nameserver [Slow][Serial]", func() {
498498
fwdTest.c = fwdTest.f.ClientSet
499499
fwdTest.run(false)
500500
})
501501
})
502502

503-
Context("Forward external name lookup", func() {
503+
ginkgo.Context("Forward external name lookup", func() {
504504
externalNameTest := &dnsExternalNameTest{dnsTestCommon: newDNSTestCommon()}
505505

506-
It("should forward externalname lookup to upstream nameserver [Slow][Serial]", func() {
506+
ginkgo.It("should forward externalname lookup to upstream nameserver [Slow][Serial]", func() {
507507
externalNameTest.c = externalNameTest.f.ClientSet
508508
externalNameTest.run(false)
509509
})
@@ -512,28 +512,28 @@ var _ = SIGDescribe("DNS configMap nameserver [IPv4]", func() {
512512

513513
var _ = SIGDescribe("DNS configMap nameserver [Feature:Networking-IPv6]", func() {
514514

515-
Context("Change stubDomain", func() {
515+
ginkgo.Context("Change stubDomain", func() {
516516
nsTest := &dnsNameserverTest{dnsTestCommon: newDNSTestCommon()}
517517

518-
It("should be able to change stubDomain configuration [Slow][Serial]", func() {
518+
ginkgo.It("should be able to change stubDomain configuration [Slow][Serial]", func() {
519519
nsTest.c = nsTest.f.ClientSet
520520
nsTest.run(true)
521521
})
522522
})
523523

524-
Context("Forward PTR lookup", func() {
524+
ginkgo.Context("Forward PTR lookup", func() {
525525
fwdTest := &dnsPtrFwdTest{dnsTestCommon: newDNSTestCommon()}
526526

527-
It("should forward PTR records lookup to upstream nameserver [Slow][Serial]", func() {
527+
ginkgo.It("should forward PTR records lookup to upstream nameserver [Slow][Serial]", func() {
528528
fwdTest.c = fwdTest.f.ClientSet
529529
fwdTest.run(true)
530530
})
531531
})
532532

533-
Context("Forward external name lookup", func() {
533+
ginkgo.Context("Forward external name lookup", func() {
534534
externalNameTest := &dnsExternalNameTest{dnsTestCommon: newDNSTestCommon()}
535535

536-
It("should forward externalname lookup to upstream nameserver [Slow][Serial]", func() {
536+
ginkgo.It("should forward externalname lookup to upstream nameserver [Slow][Serial]", func() {
537537
externalNameTest.c = externalNameTest.f.ClientSet
538538
externalNameTest.run(true)
539539
})

0 commit comments

Comments
 (0)