From efb0d3de8a305981cb007b17c0df88d2c656844b Mon Sep 17 00:00:00 2001
From: Diptanu Choudhury <diptanuc@gmail.com>
Date: Thu, 25 Aug 2016 23:05:21 -0500
Subject: [PATCH] Fixed some more tests

---
 command/plan_test.go     | 2 --
 command/run_test.go      | 3 ---
 command/util_test.go     | 6 ++++--
 command/validate_test.go | 2 --
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/command/plan_test.go b/command/plan_test.go
index 79793301e..b56f0a5cd 100644
--- a/command/plan_test.go
+++ b/command/plan_test.go
@@ -85,7 +85,6 @@ job "job1" {
 			driver = "exec"
 			resources = {
 				cpu = 1000
-				disk = 150
 				memory = 512
 			}
 		}
@@ -125,7 +124,6 @@ job "job1" {
                         driver = "exec"
                         resources = {
                                 cpu = 1000
-                                disk = 150
                                 memory = 512
                         }
                 }
diff --git a/command/run_test.go b/command/run_test.go
index 840925e45..f8a5212be 100644
--- a/command/run_test.go
+++ b/command/run_test.go
@@ -32,7 +32,6 @@ job "job1" {
 			driver = "exec"
 			resources = {
 				cpu = 1000
-				disk = 150
 				memory = 512
 			}
 		}
@@ -121,7 +120,6 @@ job "job1" {
 			driver = "exec"
 			resources = {
 				cpu = 1000
-				disk = 150
 				memory = 512
 			}
 		}
@@ -171,7 +169,6 @@ job "job1" {
 			driver = "exec"
 			resources = {
 				cpu = 1000
-				disk = 150
 				memory = 512
 			}
 		}
diff --git a/command/util_test.go b/command/util_test.go
index 00fdd339d..3a0479cf6 100644
--- a/command/util_test.go
+++ b/command/util_test.go
@@ -45,7 +45,6 @@ func testJob(jobID string) *api.Job {
 		SetConfig("exit_code", 0).
 		Require(&api.Resources{
 			MemoryMB: 256,
-			DiskMB:   20,
 			CPU:      100,
 		}).
 		SetLogConfig(&api.LogConfig{
@@ -54,7 +53,10 @@ func testJob(jobID string) *api.Job {
 		})
 
 	group := api.NewTaskGroup("group1", 1).
-		AddTask(task)
+		AddTask(task).
+		RequireDisk(&api.LocalDisk{
+			DiskMB: 20,
+		})
 
 	job := api.NewBatchJob(jobID, jobID, "region1", 1).
 		AddDatacenter("dc1").
diff --git a/command/validate_test.go b/command/validate_test.go
index ff9f42b5e..11be97511 100644
--- a/command/validate_test.go
+++ b/command/validate_test.go
@@ -32,7 +32,6 @@ job "job1" {
 			driver = "exec"
 			resources = {
 				cpu = 1000
-				disk = 150
 				memory = 512
 			}
 		}
@@ -126,7 +125,6 @@ job "job1" {
                         driver = "exec"
                         resources = {
                                 cpu = 1000
-                                disk = 150
                                 memory = 512
                         }
                 }