From 35eff08386933383d27a00ebb9ee98b55fe6a050 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Wed, 23 Jan 2019 14:09:49 -0500 Subject: [PATCH] Apply suggestions from code review Co-Authored-By: nickethier --- e2e/e2eutil/utils.go | 2 +- e2e/nomad09upgrade/exec.nomad | 2 +- e2e/nomad09upgrade/rawexec.nomad | 2 +- e2e/nomad09upgrade/upgrade.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/e2eutil/utils.go b/e2e/e2eutil/utils.go index 9f272d9c1..413254f26 100644 --- a/e2e/e2eutil/utils.go +++ b/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 diff --git a/e2e/nomad09upgrade/exec.nomad b/e2e/nomad09upgrade/exec.nomad index ddd7e5c6e..046e3a9fa 100644 --- a/e2e/nomad09upgrade/exec.nomad +++ b/e2e/nomad09upgrade/exec.nomad @@ -6,7 +6,7 @@ job "sleep" { driver = "exec" config { - command = "/bin/sleep" + command = "sleep" args = ["10000"] } diff --git a/e2e/nomad09upgrade/rawexec.nomad b/e2e/nomad09upgrade/rawexec.nomad index 51e9c3483..75fd5aefa 100644 --- a/e2e/nomad09upgrade/rawexec.nomad +++ b/e2e/nomad09upgrade/rawexec.nomad @@ -6,7 +6,7 @@ job "sleep" { driver = "raw_exec" config { - command = "/bin/sleep" + command = "sleep" args = ["10000"] } diff --git a/e2e/nomad09upgrade/upgrade.go b/e2e/nomad09upgrade/upgrade.go index 800301101..f3727d027 100644 --- a/e2e/nomad09upgrade/upgrade.go +++ b/e2e/nomad09upgrade/upgrade.go @@ -308,7 +308,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