github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4356 from filbranden/hack_e2e_clustersize_output

Browse Source 
Simplify ValidateClusterSize() to use cmd.Output() directly
This commit is contained in:
Filipe Brandenburger 2015-02-11 16:55:30 -08:00
commit f9a4471eca
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hack/e2e.go
View File

@ -184,12 +184,16 @@ func Up() bool {
// Ensure that the cluster is large engough to run the e2e tests. // Ensure that the cluster is large engough to run the e2e tests.
func ValidateClusterSize() { func ValidateClusterSize() {
// Check that there are at least 3 minions running // 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"))) cmd := exec.Command(path.Join(*root, "hack/e2e-internal/e2e-cluster-size.sh"))
if !res { if *verbose {
log.Fatal("Could not get nodes to validate cluster size") 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 { if err != nil {
log.Fatalf("Could not count number of nodes to validate cluster size (%s)", err) log.Fatalf("Could not count number of nodes to validate cluster size (%s)", err)
} }