From 43543faaa7bc944ff7c475807fca0e42868d2769 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Wed, 11 Feb 2015 14:57:34 -0800 Subject: [PATCH] Simplify ValidateClusterSize() to use cmd.Output() directly This is a first step towards getting rid of finishRunningWithOutputs and using the native os/exec methods directly where possible. --- hack/e2e.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hack/e2e.go b/hack/e2e.go index bb134d8a935..b5d6efa3f78 100644 --- a/hack/e2e.go +++ b/hack/e2e.go @@ -184,12 +184,16 @@ func Up() bool { // Ensure that the cluster is large engough to run the e2e tests. func ValidateClusterSize() { // Check that there are at least 3 minions running - res, stdout, _ := finishRunningWithOutputs("validate cluster size", exec.Command(path.Join(*root, "hack/e2e-internal/e2e-cluster-size.sh"))) - if !res { - log.Fatal("Could not get nodes to validate cluster size") + cmd := exec.Command(path.Join(*root, "hack/e2e-internal/e2e-cluster-size.sh")) + if *verbose { + cmd.Stderr = os.Stderr + } + stdout, err := cmd.Output() + if err != nil { + log.Fatal("Could not get nodes to validate cluster size (%s)", err) } - numNodes, err := strconv.Atoi(strings.TrimSpace(stdout)) + numNodes, err := strconv.Atoi(strings.TrimSpace(string(stdout))) if err != nil { log.Fatalf("Could not count number of nodes to validate cluster size (%s)", err) }