github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #21569 from lavalamp/fix-shadowing 

fix shadowing bug
pull/6/head
Alex Robinson 2016-02-24 14:42:58 -08:00
parent cbcc25802e 6afe858b44
commit 475076e1df
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/e2e.go
View File

@ -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)
}