Merge pull request #8638 from jayunit100/fix_c_shadow

quick fix to global (and possibly shadowing) client var
This commit is contained in:
Robert Bailey 2015-05-21 16:02:38 -07:00
commit d9d12fd3f7
3 changed files with 8 additions and 2 deletions

View File

@ -31,8 +31,6 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
var c *client.Client = nil
func LaunchNetTestPodPerNode(nodes *api.NodeList, name string, c *client.Client, ns string) []string { func LaunchNetTestPodPerNode(nodes *api.NodeList, name string, c *client.Client, ns string) []string {
podNames := []string{} podNames := []string{}

View File

@ -55,6 +55,9 @@ const (
) )
var _ = Describe("Reboot", func() { var _ = Describe("Reboot", func() {
var c *client.Client = nil
BeforeEach(func() { BeforeEach(func() {
var err error var err error
c, err = loadClient() c, err = loadClient()

View File

@ -20,11 +20,16 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
var _ = Describe("SSH", func() { var _ = Describe("SSH", func() {
var c *client.Client = nil
BeforeEach(func() { BeforeEach(func() {
var err error var err error
c, err = loadClient() c, err = loadClient()