Merge branch 'f-driver-upgradepath-test' of https://github.com/hashicorp/nomad into f-driver-upgradepath-test

* 'f-driver-upgradepath-test' of https://github.com/hashicorp/nomad:
  Apply suggestions from code review

e2e/e2eutil/utils.go

@@ -82,7 +82,7 @@ func RegisterAndWaitForAllocs(t *testing.T, nomadClient *api.Client, jobFile str
 
 func WaitForAllocRunning(t *testing.T, nomadClient *api.Client, allocID string) {
 	testutil.WaitForResultRetries(retries, func() (bool, error) {
-		defer time.Sleep(time.Millisecond * 100)
+		time.Sleep(time.Millisecond * 100)
 		alloc, _, err := nomadClient.Allocations().Info(allocID, nil)
 		if err != nil {
 			return false, err

e2e/nomad09upgrade/exec.nomad

@@ -6,7 +6,7 @@ job "sleep" {
       driver = "exec"
 
       config {
-        command = "/bin/sleep"
+        command = "sleep"
         args = ["10000"]
       }
 

e2e/nomad09upgrade/rawexec.nomad

@@ -6,7 +6,7 @@ job "sleep" {
       driver = "raw_exec"
 
       config {
-        command = "/bin/sleep"
+        command = "sleep"
         args = ["10000"]
       }
 

e2e/nomad09upgrade/upgrade.go

@@ -318,7 +318,7 @@ func (tc *UpgradePathTC) testUpgradeForJob(t *testing.T, ver string, jobfile str
 	// Check that the task dir mounts have been removed
 	testutil.WaitForResult(func() (bool, error) {
 		defer client.System().GarbageCollect()
-		defer time.Sleep(time.Millisecond * 100)
+		time.Sleep(time.Millisecond * 100)
 		data, err := ioutil.ReadFile("/proc/mounts")
 		if err != nil {
 			return false, err