From c219d138ef60462fd1151963bd120f875665f516 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Thu, 13 Nov 2014 17:03:06 -0800 Subject: [PATCH] make e2e test get events in background, for easier debugging after the fact. --- hack/e2e.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/hack/e2e.go b/hack/e2e.go index 0f7dcd5f304..26228d6b490 100644 --- a/hack/e2e.go +++ b/hack/e2e.go @@ -134,6 +134,7 @@ func tryUp() bool { } func Test() (failed, passed []string) { + defer runBashUntil("watchEvents", "$KUBECTL --watch-only get events")() // run tests! dir, err := os.Open(filepath.Join(*root, "hack", "e2e-suite")) if err != nil { @@ -175,6 +176,24 @@ func runBash(stepName, bashFragment string) bool { return finishRunning(stepName, cmd) } +// call the returned anonymous function to stop. +func runBashUntil(stepName, bashFragment string) func() { + cmd := exec.Command("bash", "-s") + cmd.Stdin = strings.NewReader(bashWrap(bashFragment)) + log.Printf("Running in background: %v", stepName) + stdout, stderr := bytes.NewBuffer(nil), bytes.NewBuffer(nil) + cmd.Stdout, cmd.Stderr = stdout, stderr + if err := cmd.Start(); err != nil { + log.Printf("Unable to start '%v': '%v'", stepName, err) + return func() {} + } + return func() { + cmd.Process.Signal(os.Interrupt) + fmt.Printf("%v stdout:\n------\n%v\n------\n", stepName, string(stdout.Bytes())) + fmt.Printf("%v stderr:\n------\n%v\n------\n", stepName, string(stderr.Bytes())) + } +} + func run(stepName, cmdPath string) bool { return finishRunning(stepName, exec.Command(filepath.Join(*root, cmdPath))) }