From 50d5fb7db6a7484ffcd45ac280ea5c793cf9ba41 Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Thu, 21 Jan 2016 12:55:35 -0800
Subject: [PATCH] Bump again

---
 client/driver/raw_exec_test.go | 6 +++---
 client/task_runner_test.go     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/driver/raw_exec_test.go b/client/driver/raw_exec_test.go
index 2a16847d8..a33928a2a 100644
--- a/client/driver/raw_exec_test.go
+++ b/client/driver/raw_exec_test.go
@@ -285,7 +285,7 @@ func TestRawExecDriver_Start_Kill_Wait(t *testing.T) {
 		Name: "sleep",
 		Config: map[string]interface{}{
 			"command": testtask.Path(),
-			"args":    []string{"sleep", "5s"},
+			"args":    []string{"sleep", "15s"},
 		},
 		Resources: basicResources,
 	}
@@ -304,7 +304,7 @@ func TestRawExecDriver_Start_Kill_Wait(t *testing.T) {
 	}
 
 	go func() {
-		time.Sleep(time.Duration(testutil.TestMultiplier()*1) * time.Second)
+		time.Sleep(1 * time.Second)
 		err := handle.Kill()
 		if err != nil {
 			t.Fatalf("err: %v", err)
@@ -317,7 +317,7 @@ func TestRawExecDriver_Start_Kill_Wait(t *testing.T) {
 		if res.Successful() {
 			t.Fatal("should err")
 		}
-	case <-time.After(3 * time.Second):
+	case <-time.After(time.Duration(testutil.TestMultiplier()*3) * time.Second):
 		t.Fatalf("timeout")
 	}
 }
diff --git a/client/task_runner_test.go b/client/task_runner_test.go
index 6938d39a4..9101d6a81 100644
--- a/client/task_runner_test.go
+++ b/client/task_runner_test.go
@@ -100,7 +100,7 @@ func TestTaskRunner_Destroy(t *testing.T) {
 
 	select {
 	case <-tr.WaitCh():
-	case <-time.After(15 * time.Second):
+	case <-time.After(time.Duration(testutil.TestMultiplier()*15) * time.Second):
 		t.Fatalf("timeout")
 	}
 
@@ -175,7 +175,7 @@ func TestTaskRunner_SaveRestoreState(t *testing.T) {
 	defer tr2.Destroy()
 
 	// Destroy and wait
-	time.Sleep(time.Duration(testutil.TestMultiplier()*2) * time.Second)
+	time.Sleep(time.Duration(testutil.TestMultiplier()*5) * time.Second)
 	if tr2.handle == nil {
 		t.Fatalf("RestoreState() didn't open handle")
 	}