From 6afe858b449d717b777cfc810c9b008ef716c7e1 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Fri, 19 Feb 2016 10:44:18 -0800 Subject: [PATCH] fix shadowing bug --- test/e2e/e2e.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index 6ff0ed77049..d9b64f3a847 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -33,14 +33,13 @@ import ( "github.com/onsi/gomega" "golang.org/x/oauth2" "golang.org/x/oauth2/google" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/cloudprovider" gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/runtime" - - . "github.com/onsi/gomega" ) const ( @@ -182,9 +181,11 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte { // test pods from running, and tests that ensure all pods are running and // ready will fail). if err := waitForPodsRunningReady(api.NamespaceSystem, testContext.MinStartupPods, podStartupTimeout); err != nil { - c, err := loadClient() - Expect(err).NotTo(HaveOccurred()) - dumpAllNamespaceInfo(c, api.NamespaceSystem) + if c, errClient := loadClient(); errClient != nil { + Logf("Unable to dump cluster information because: %v", errClient) + } else { + dumpAllNamespaceInfo(c, api.NamespaceSystem) + } Failf("Error waiting for all pods to be running and ready: %v", err) }