From 04094cfb40c6179acd659ca45ec9c4b2671b6f01 Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Fri, 25 Sep 2015 17:55:29 -0700 Subject: [PATCH] Small test cleanup --- client/driver/exec_test.go | 2 +- client/driver/java.go | 2 -- client/driver/java_test.go | 2 +- client/executor/exec_linux_test.go | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/client/driver/exec_test.go b/client/driver/exec_test.go index 2c29d7885..6dba6a4c9 100644 --- a/client/driver/exec_test.go +++ b/client/driver/exec_test.go @@ -151,7 +151,7 @@ func TestExecDriver_Start_Kill_Wait(t *testing.T) { select { case err := <-handle.WaitCh(): if err == nil { - t.Fatalf("should err: %v", err) + t.Fatal("should err") } case <-time.After(2 * time.Second): t.Fatalf("timeout") diff --git a/client/driver/java.go b/client/driver/java.go index 957f7f601..96a63225b 100644 --- a/client/driver/java.go +++ b/client/driver/java.go @@ -219,8 +219,6 @@ func (h *javaHandle) run() { close(h.doneCh) if err != nil { h.waitCh <- err - } else if !h.cmd.Command().ProcessState.Success() { - h.waitCh <- fmt.Errorf("task exited with error") } close(h.waitCh) } diff --git a/client/driver/java_test.go b/client/driver/java_test.go index 1d8a4afa8..c576e9bc1 100644 --- a/client/driver/java_test.go +++ b/client/driver/java_test.go @@ -161,7 +161,7 @@ func TestJavaDriver_Start_Kill_Wait(t *testing.T) { select { case err := <-handle.WaitCh(): if err == nil { - t.Fatalf("should err: %v", err) + t.Fatal("should err") } case <-time.After(2 * time.Second): t.Fatalf("timeout") diff --git a/client/executor/exec_linux_test.go b/client/executor/exec_linux_test.go index 97402a717..3d289e134 100644 --- a/client/executor/exec_linux_test.go +++ b/client/executor/exec_linux_test.go @@ -96,7 +96,7 @@ func TestExecutorLinux_Start_Wait(t *testing.T) { expected := "hello world" file := filepath.Join(allocdir.TaskLocal, "output.txt") absFilePath := filepath.Join(taskDir, file) - cmd := fmt.Sprintf("%v \"%v\" >> %v", "sleep 1 ; echo -n", expected, file) + cmd := fmt.Sprintf("%v \"%v\" > %v", "sleep 1 ; echo -n", expected, file) e := Command("/bin/bash", "-c", cmd) if err := e.Limit(constraint); err != nil {