fix test for node drain metadata

hashicorp · May 7, 2021 · 4174b02 · 4174b02
1 parent b2bf771
commit 4174b02
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/api/nodes_test.go b/api/nodes_test.go
@@ -291,7 +291,7 @@ func TestNodes_ToggleDrain(t *testing.T) {
 					sawDraining = node.ModifyIndex
 				} else if sawDraining != 0 && !node.Drain && node.SchedulingEligibility == NodeSchedulingIneligible {
 					require.NotNil(node.LastDrain)
-					require.Equal(DrainStatusCompleted, node.LastDrain.Status)
+					require.Equal(DrainStatusComplete, node.LastDrain.Status)
 					require.True(!node.LastDrain.UpdatedAt.Before(node.LastDrain.StartedAt))
 					require.Equal(drainMeta, node.LastDrain.Meta)
 					sawDrainComplete = node.ModifyIndex

diff --git a/command/agent/node_endpoint_test.go b/command/agent/node_endpoint_test.go
@@ -322,12 +322,12 @@ func TestHTTP_NodeDrain(t *testing.T) {
 		require.NotNil(out.LastDrain)
 		require.False(out.LastDrain.StartedAt.Before(beforeDrain))
 		require.False(out.LastDrain.UpdatedAt.Before(out.LastDrain.StartedAt))
-		require.Contains([]string{structs.DrainStatusCancelled, structs.DrainStatusComplete}, out.LastDrain.Status)
+		require.Contains([]string{structs.DrainStatusCanceled, structs.DrainStatusComplete}, out.LastDrain.Status)
 		if out.LastDrain.Status == structs.DrainStatusComplete {
 			require.Equal(map[string]string{
 				"reason": "drain",
 			}, out.LastDrain.Meta)
-		} else if out.LastDrain.Status == structs.DrainStatusCancelled {
+		} else if out.LastDrain.Status == structs.DrainStatusCanceled {
 			require.Equal(map[string]string{
 				"cancel_reason": "changed my mind",
 			}, out.LastDrain.Meta)

diff --git a/nomad/node_endpoint_test.go b/nomad/node_endpoint_test.go
@@ -975,7 +975,7 @@ func TestClientEndpoint_UpdateDrain(t *testing.T) {
 	require.Equal(structs.DrainMetadata{
 		StartedAt: out.LastDrain.StartedAt,
 		UpdatedAt: out.LastDrain.UpdatedAt,
-		Status:    structs.DrainStatusCancelled,
+		Status:    structs.DrainStatusCanceled,
 		Meta:      map[string]string{"cancelled": "yes"},
 	}, *out.LastDrain)
 

diff --git a/nomad/state/state_store_test.go b/nomad/state/state_store_test.go
@@ -1157,7 +1157,7 @@ func TestStateStore_UpdateNodeDrain_ResetEligiblity(t *testing.T) {
 	require.Nil(out.DrainStrategy)
 	require.Equal(out.SchedulingEligibility, structs.NodeSchedulingEligible)
 	require.NotNil(out.LastDrain)
-	require.Equal(structs.DrainStatusCancelled, out.LastDrain.Status)
+	require.Equal(structs.DrainStatusCanceled, out.LastDrain.Status)
 	require.Equal(time.Unix(7, 0), out.LastDrain.StartedAt)
 	require.Equal(time.Unix(9, 0), out.LastDrain.UpdatedAt)
 	require.Len(out.Events, 3)