From f37d8fd60f93fe5da3bb0a9daec4fe3accaf00e5 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Wed, 20 Jul 2016 13:26:56 -0400 Subject: [PATCH] Fix node e2e (kubelet metrics) by adding GinkgoRecover to a goroutine to avoid panic --- test/e2e/framework/pods.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/framework/pods.go b/test/e2e/framework/pods.go index 4c6b56cbeee..ff2a70833e1 100644 --- a/test/e2e/framework/pods.go +++ b/test/e2e/framework/pods.go @@ -26,6 +26,7 @@ import ( "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util/wait" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) @@ -67,8 +68,9 @@ func (c *PodClient) CreateBatch(pods []*api.Pod) []*api.Pod { for i, pod := range pods { wg.Add(1) go func(i int, pod *api.Pod) { + defer wg.Done() + defer GinkgoRecover() ps[i] = c.CreateSync(pod) - wg.Done() }(i, pod) } wg.Wait()