From 8fa599c4a57f9fc0f74a3b9153cd2ce412356d07 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Fri, 21 Jul 2017 13:43:32 -0700 Subject: [PATCH] Fixup a few more even rarer test races --- client/alloc_runner_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/client/alloc_runner_test.go b/client/alloc_runner_test.go index 3065cb950..0f05e908e 100644 --- a/client/alloc_runner_test.go +++ b/client/alloc_runner_test.go @@ -629,7 +629,8 @@ func TestAllocRunner_SaveRestoreState(t *testing.T) { return last.ClientStatus == structs.AllocClientStatusRunning, nil }, func(err error) { - t.Fatalf("err: %v %#v %#v", err, upd.Allocs[0], ar2.alloc.TaskStates["web"]) + _, last := upd.Last() + t.Fatalf("err: %v %#v %#v", err, last, last.TaskStates["web"]) }) // Destroy and wait @@ -643,7 +644,8 @@ func TestAllocRunner_SaveRestoreState(t *testing.T) { } return true, nil }, func(err error) { - t.Fatalf("err: %v %#v %#v", err, upd.Allocs[0], ar.alloc.TaskStates) + _, last := upd.Last() + t.Fatalf("err: %v %#v %#v", err, last, last.TaskStates) }) if time.Since(start) > time.Duration(testutil.TestMultiplier()*5)*time.Second { @@ -728,7 +730,8 @@ func TestAllocRunner_SaveRestoreState_TerminalAlloc(t *testing.T) { return true, nil }, func(err error) { - t.Fatalf("err: %v %#v %#v", err, upd.Allocs[0], ar.alloc.TaskStates) + _, last := upd.Last() + t.Fatalf("err: %v %#v %#v", err, last, last.TaskStates) }) // Send the destroy signal and ensure the AllocRunner cleans up. @@ -845,7 +848,8 @@ func TestAllocRunner_SaveRestoreState_Upgrade(t *testing.T) { } return true, nil }, func(err error) { - t.Fatalf("err: %v %#v %#v", err, upd.Allocs[0], ar.alloc.TaskStates) + _, last := upd.Last() + t.Fatalf("err: %v %#v %#v", err, last, last.TaskStates) }) if time.Since(start) > time.Duration(testutil.TestMultiplier()*5)*time.Second {