dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix short tests on darwin (#3099)

This commit is contained in:
Daniel Nelson 2017-09-08 13:03:37 -07:00 committed by GitHub
parent 98ca22597d
commit d0b690f040
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/internal_test.go
View File

@ -40,6 +40,7 @@ func TestSnakeCase(t *testing.T) {
var ( var (
sleepbin, _ = exec.LookPath("sleep") sleepbin, _ = exec.LookPath("sleep")
echobin, _ = exec.LookPath("echo") echobin, _ = exec.LookPath("echo")
shell, _ = exec.LookPath("sh")
) )
func TestRunTimeout(t *testing.T) { func TestRunTimeout(t *testing.T) {
@ -84,13 +85,13 @@ func TestCombinedOutput(t *testing.T) {
// test that CombinedOutputTimeout and exec.Cmd.CombinedOutput return // test that CombinedOutputTimeout and exec.Cmd.CombinedOutput return
// the same output from a failed command. // the same output from a failed command.
func TestCombinedOutputError(t *testing.T) { func TestCombinedOutputError(t *testing.T) {
if sleepbin == "" { if shell == "" {
t.Skip("'sleep' binary not available on OS, skipping.") t.Skip("'sh' binary not available on OS, skipping.")
} }
cmd := exec.Command(sleepbin, "foo") cmd := exec.Command(shell, "-c", "false")
expected, err := cmd.CombinedOutput() expected, err := cmd.CombinedOutput()
cmd2 := exec.Command(sleepbin, "foo") cmd2 := exec.Command(shell, "-c", "false")
actual, err := CombinedOutputTimeout(cmd2, time.Second) actual, err := CombinedOutputTimeout(cmd2, time.Second)
assert.Error(t, err) assert.Error(t, err)
@ -98,10 +99,10 @@ func TestCombinedOutputError(t *testing.T) {
} }
func TestRunError(t *testing.T) { func TestRunError(t *testing.T) {
if sleepbin == "" { if shell == "" {
t.Skip("'sleep' binary not available on OS, skipping.") t.Skip("'sh' binary not available on OS, skipping.")
} }
cmd := exec.Command(sleepbin, "foo") cmd := exec.Command(shell, "-c", "false")
err := RunTimeout(cmd, time.Second) err := RunTimeout(cmd, time.Second)
assert.Error(t, err) assert.Error(t, err)