Merge pull request #8638 from jayunit100/fix_c_shadow

roberthbailey · roberthbailey · commit d9d12fd3f703 · 2015-05-21T16:02:38.000-07:00
quick fix to global (and possibly shadowing) client var
diff --git a/test/e2e/networking.go b/test/e2e/networking.go
@@ -31,8 +31,6 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var c *client.Client = nil
-
 func LaunchNetTestPodPerNode(nodes *api.NodeList, name string, c *client.Client, ns string) []string {
 	podNames := []string{}
 
diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go
@@ -55,6 +55,9 @@ const (
 )
 
 var _ = Describe("Reboot", func() {
+
+	var c *client.Client = nil
+
 	BeforeEach(func() {
 		var err error
 		c, err = loadClient()
diff --git a/test/e2e/ssh.go b/test/e2e/ssh.go
@@ -20,11 +20,16 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("SSH", func() {
+
+	var c *client.Client = nil
+
 	BeforeEach(func() {
 		var err error
 		c, err = loadClient()

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ import (`
`31`	`31`	`. "github.com/onsi/gomega"`
`32`	`32`	`)`
`33`	`33`
`34`		`-var c *client.Client = nil`
`35`		`-`
`36`	`34`	`func LaunchNetTestPodPerNode(nodes api.NodeList, name string, c client.Client, ns string) []string {`
`37`	`35`	`podNames := []string{}`
`38`	`36`