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

kubeadm: only print stderr/stdout if failed test

Browse Source
This commit is contained in:
Derek McQuay 2017-03-15 11:34:13 -07:00
parent 5826b09a19
commit 14d79f2cc0
No known key found for this signature in database
GPG Key ID: 92A7BC0C86B0B91A
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kubeadm/test/cmd/util.go
View File

@ -19,8 +19,6 @@ package kubeadm
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io"
"os"
"os/exec" "os/exec"
) )
@ -29,12 +27,12 @@ import (
func RunCmd(command string, args ...string) (string, string, error) { func RunCmd(command string, args ...string) (string, string, error) {
var bout, berr bytes.Buffer var bout, berr bytes.Buffer
cmd := exec.Command(command, args...) cmd := exec.Command(command, args...)
cmd.Stdout = io.MultiWriter(os.Stdout, &bout) cmd.Stdout = &bout
cmd.Stderr = io.MultiWriter(os.Stderr, &berr) cmd.Stderr = &berr
err := cmd.Run() err := cmd.Run()
stdout, stderr := bout.String(), berr.String() stdout, stderr := bout.String(), berr.String()
if err != nil { if err != nil {
return "", "", fmt.Errorf("error running %s %v; got error %v, stdout %q, stderr %q", return "", "", fmt.Errorf("error running %s %v; \ngot error %v, \nstdout %q, \nstderr %q",
command, args, err, stdout, stderr) command, args, err, stdout, stderr)
} }
return stdout, stderr, nil return stdout, stderr, nil