From d760e68774f3a5f6b659d9c5e66d909f11072f61 Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Sat, 22 Jul 2017 19:27:20 -0700
Subject: [PATCH] darwin test fixes

---
 client/allocdir/alloc_dir_test.go       | 6 ++++--
 client/driver/executor/executor_test.go | 8 ++++----
 client/driver/java_test.go              | 3 +++
 client/driver/raw_exec_test.go          | 4 ++++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/client/allocdir/alloc_dir_test.go b/client/allocdir/alloc_dir_test.go
index 774d84ed3..bcee7dd1d 100644
--- a/client/allocdir/alloc_dir_test.go
+++ b/client/allocdir/alloc_dir_test.go
@@ -371,8 +371,10 @@ func TestAllocDir_SplitPath(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	if len(info) != 6 {
-		t.Fatalf("expected: %v, actual: %v", 6, len(info))
+	// Testing that is 6 or more rather than 6 because on osx, the temp dir is
+	// randomized.
+	if len(info) < 6 {
+		t.Fatalf("expected more than: %v, actual: %v", 6, len(info))
 	}
 }
 
diff --git a/client/driver/executor/executor_test.go b/client/driver/executor/executor_test.go
index b4b741f0a..b4594635a 100644
--- a/client/driver/executor/executor_test.go
+++ b/client/driver/executor/executor_test.go
@@ -81,7 +81,7 @@ func TestExecutor_Start_Invalid(t *testing.T) {
 
 func TestExecutor_Start_Wait_Failure_Code(t *testing.T) {
 	t.Parallel()
-	execCmd := ExecCommand{Cmd: "/bin/sleep", Args: []string{"fail"}}
+	execCmd := ExecCommand{Cmd: "/bin/date", Args: []string{"fail"}}
 	ctx, allocDir := testExecutorContext(t)
 	defer allocDir.Destroy()
 	executor := NewExecutor(log.New(os.Stdout, "", log.LstdFlags))
@@ -163,13 +163,13 @@ func TestExecutor_WaitExitSignal(t *testing.T) {
 	}
 
 	go func() {
-		time.Sleep(3 * time.Second)
+		time.Sleep(2 * time.Second)
 		ru, err := executor.Stats()
 		if err != nil {
 			t.Fatalf("err: %v", err)
 		}
-		if len(ru.Pids) != 2 {
-			t.Fatalf("expected number of pids: 2, actual: %v", len(ru.Pids))
+		if len(ru.Pids) == 0 {
+			t.Fatalf("expected pids")
 		}
 		proc, err := os.FindProcess(ps.Pid)
 		if err != nil {
diff --git a/client/driver/java_test.go b/client/driver/java_test.go
index 27fd4f9d6..10e4a24bb 100644
--- a/client/driver/java_test.go
+++ b/client/driver/java_test.go
@@ -310,6 +310,9 @@ func TestJavaDriverUser(t *testing.T) {
 	if !javaLocated() {
 		t.Skip("Java not found; skipping")
 	}
+	if runtime.GOOS != "linux" {
+		t.Skip("Linux only test")
+	}
 
 	ctestutils.JavaCompatible(t)
 	task := &structs.Task{
diff --git a/client/driver/raw_exec_test.go b/client/driver/raw_exec_test.go
index 126998779..d8d98fb0b 100644
--- a/client/driver/raw_exec_test.go
+++ b/client/driver/raw_exec_test.go
@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 	"reflect"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -261,6 +262,9 @@ func TestRawExecDriver_Start_Kill_Wait(t *testing.T) {
 
 func TestRawExecDriverUser(t *testing.T) {
 	t.Parallel()
+	if runtime.GOOS != "linux" {
+		t.Skip("Linux only test")
+	}
 	task := &structs.Task{
 		Name:   "sleep",
 		Driver: "raw_exec",