Skip to content

K
k3s
Commit 9d0bc4b8 authored by Akihito INOH's avatar Akihito INOH
Browse files
Options

Fix golint failures of e2e/framework/util.go - part1

This is a part of a series for fixing golint failures for util.go. - fixes `should not use dot imports` about `ginkgo` and `gomega` - fixes golint failures from top of file to line 1394 at original util.go This fixes golint failures of the following file: - test/e2e/framework/util.go This changes following files because of change function name in above file. - test/e2e/e2e.go - test/e2e/network/network_tiers.go - test/e2e/network/service.go
parent b359b6bf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
test/e2e/e2e.go
View file @ 9d0bc4b8
...@@ -237,7 +237,7 @@ func RunE2ETests(t *testing.T) { ...@@ -237,7 +237,7 @@ func RunE2ETests(t *testing.T) {
r = append(r, reporters.NewJUnitReporter(path.Join(framework.TestContext.ReportDir, fmt.Sprintf("junit_%v%02d.xml", framework.TestContext.ReportPrefix, config.GinkgoConfig.ParallelNode)))) r = append(r, reporters.NewJUnitReporter(path.Join(framework.TestContext.ReportDir, fmt.Sprintf("junit_%v%02d.xml", framework.TestContext.ReportPrefix, config.GinkgoConfig.ParallelNode))))
} }
} }
klog.Infof("Starting e2e run %q on Ginkgo node %d", framework.RunId, config.GinkgoConfig.ParallelNode) klog.Infof("Starting e2e run %q on Ginkgo node %d", framework.RunID, config.GinkgoConfig.ParallelNode)
ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "Kubernetes e2e suite", r) ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "Kubernetes e2e suite", r)
} }
......
test/e2e/network/network_tiers.go
View file @ 9d0bc4b8
...@@ -102,7 +102,7 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() { ...@@ -102,7 +102,7 @@ var _ = SIGDescribe("Services [Feature:GCEAlphaFeature][Slow]", func() {
// Test 3: create a standard-tierd LB with a user-requested IP. // Test 3: create a standard-tierd LB with a user-requested IP.
By("reserving a static IP for the load balancer") By("reserving a static IP for the load balancer")
requestedAddrName := fmt.Sprintf("e2e-ext-lb-net-tier-%s", framework.RunId) requestedAddrName := fmt.Sprintf("e2e-ext-lb-net-tier-%s", framework.RunID)
gceCloud, err := gce.GetGCECloud() gceCloud, err := gce.GetGCECloud()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
requestedIP, err := reserveAlphaRegionalAddress(gceCloud, requestedAddrName, cloud.NetworkTierStandard) requestedIP, err := reserveAlphaRegionalAddress(gceCloud, requestedAddrName, cloud.NetworkTierStandard)
......
test/e2e/network/service.go
View file @ 9d0bc4b8
...@@ -588,7 +588,7 @@ var _ = SIGDescribe("Services", func() { ...@@ -588,7 +588,7 @@ var _ = SIGDescribe("Services", func() {
staticIPName := "" staticIPName := ""
if framework.ProviderIs("gce", "gke") { if framework.ProviderIs("gce", "gke") {
By("creating a static load balancer IP") By("creating a static load balancer IP")
staticIPName = fmt.Sprintf("e2e-external-lb-test-%s", framework.RunId) staticIPName = fmt.Sprintf("e2e-external-lb-test-%s", framework.RunID)
gceCloud, err := gce.GetGCECloud() gceCloud, err := gce.GetGCECloud()
Expect(err).NotTo(HaveOccurred(), "failed to get GCE cloud provider") Expect(err).NotTo(HaveOccurred(), "failed to get GCE cloud provider")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment