From 2bb18741b0fb997304b740f59bd609ab4c00154a Mon Sep 17 00:00:00 2001
From: Michael Schurter <schmichael@hashicorp.com>
Date: Tue, 20 Mar 2018 12:11:08 -0700
Subject: [PATCH] api: fix tests to expect default migrate strategy

---
 api/jobs_test.go  |  5 +++++
 api/nodes_test.go | 21 ++++++---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/api/jobs_test.go b/api/jobs_test.go
index edf045a3c..194470494 100644
--- a/api/jobs_test.go
+++ b/api/jobs_test.go
@@ -141,6 +141,7 @@ func TestJobs_Canonicalize(t *testing.T) {
 							MaxDelay:      helper.TimeToPtr(1 * time.Hour),
 							Unlimited:     helper.BoolToPtr(true),
 						},
+						Migrate: DefaultMigrateStrategy(),
 						Tasks: []*Task{
 							{
 								KillTimeout: helper.TimeToPtr(5 * time.Second),
@@ -211,6 +212,7 @@ func TestJobs_Canonicalize(t *testing.T) {
 							MaxDelay:      helper.TimeToPtr(1 * time.Hour),
 							Unlimited:     helper.BoolToPtr(true),
 						},
+						Migrate: DefaultMigrateStrategy(),
 						Tasks: []*Task{
 							{
 								Name:        "task1",
@@ -363,6 +365,7 @@ func TestJobs_Canonicalize(t *testing.T) {
 							AutoRevert:      helper.BoolToPtr(false),
 							Canary:          helper.IntToPtr(0),
 						},
+						Migrate: DefaultMigrateStrategy(),
 						Tasks: []*Task{
 							{
 								Name:   "redis",
@@ -576,6 +579,7 @@ func TestJobs_Canonicalize(t *testing.T) {
 							AutoRevert:      helper.BoolToPtr(true),
 							Canary:          helper.IntToPtr(1),
 						},
+						Migrate: DefaultMigrateStrategy(),
 						Tasks: []*Task{
 							{
 								Name:        "task1",
@@ -616,6 +620,7 @@ func TestJobs_Canonicalize(t *testing.T) {
 							AutoRevert:      helper.BoolToPtr(false),
 							Canary:          helper.IntToPtr(0),
 						},
+						Migrate: DefaultMigrateStrategy(),
 						Tasks: []*Task{
 							{
 								Name:        "task1",
diff --git a/api/nodes_test.go b/api/nodes_test.go
index d2b02b82c..4945b3f99 100644
--- a/api/nodes_test.go
+++ b/api/nodes_test.go
@@ -142,6 +142,7 @@ func TestNodes_Info(t *testing.T) {
 
 func TestNodes_ToggleDrain(t *testing.T) {
 	t.Parallel()
+	require := require.New(t)
 	c, s := makeClient(t, nil, func(c *testutil.TestServerConfig) {
 		c.DevMode = true
 	})
@@ -166,9 +167,7 @@ func TestNodes_ToggleDrain(t *testing.T) {
 
 	// Check for drain mode
 	out, _, err := nodes.Info(nodeID, nil)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
+	require.Nil(err)
 	if out.Drain {
 		t.Fatalf("drain mode should be off")
 	}
@@ -178,32 +177,24 @@ func TestNodes_ToggleDrain(t *testing.T) {
 		Deadline: 10 * time.Second,
 	}
 	wm, err := nodes.UpdateDrain(nodeID, spec, false, nil)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
+	require.Nil(err)
 	assertWriteMeta(t, wm)
 
 	// Check again
 	out, _, err = nodes.Info(nodeID, nil)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
+	require.Nil(err)
 	if out.SchedulingEligibility != structs.NodeSchedulingIneligible {
 		t.Fatalf("bad eligibility: %v vs %v", out.SchedulingEligibility, structs.NodeSchedulingIneligible)
 	}
 
 	// Toggle off again
 	wm, err = nodes.UpdateDrain(nodeID, nil, true, nil)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
+	require.Nil(err)
 	assertWriteMeta(t, wm)
 
 	// Check again
 	out, _, err = nodes.Info(nodeID, nil)
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
+	require.Nil(err)
 	if out.Drain {
 		t.Fatalf("drain mode should be off")
 	}