Fix linting errors

hashicorp · Mar 20, 2018 · af3e8d2 · af3e8d2
1 parent 9f68df7
commit af3e8d2
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/command/agent/node_endpoint_test.go b/command/agent/node_endpoint_test.go
@@ -292,7 +292,7 @@ func TestHTTP_NodeDrain(t *testing.T) {
 		respW = httptest.NewRecorder()
 
 		// Make the request
-		obj, err = s.Server.NodeSpecificRequest(respW, req)
+		_, err = s.Server.NodeSpecificRequest(respW, req)
 		require.Nil(err)
 
 		out, err = state.NodeByID(nil, node.ID)

diff --git a/nomad/drainer/watch_jobs_test.go b/nomad/drainer/watch_jobs_test.go
@@ -289,7 +289,6 @@ func TestDrainingJobWatcher_DrainJobs(t *testing.T) {
 		}
 	}
 	require.Nil(state.UpsertAllocs(index, replacements))
-	index++
 
 	// No jobs should be left!
 	require.Empty(jobWatcher.drainingJobs())

diff --git a/nomad/fsm_test.go b/nomad/fsm_test.go
@@ -300,7 +300,7 @@ func TestFSM_BatchUpdateNodeDrain(t *testing.T) {
 	}
 	req2 := structs.BatchNodeUpdateDrainRequest{
 		Updates: map[string]*structs.DrainUpdate{
-			node.ID: &structs.DrainUpdate{
+			node.ID: {
 				DrainStrategy: strategy,
 			},
 		},

diff --git a/nomad/state/state_store_test.go b/nomad/state/state_store_test.go
@@ -718,10 +718,10 @@ func TestStateStore_BatchUpdateNodeDrain(t *testing.T) {
 	}
 
 	update := map[string]*structs.DrainUpdate{
-		n1.ID: &structs.DrainUpdate{
+		n1.ID: {
 			DrainStrategy: expectedDrain,
 		},
-		n2.ID: &structs.DrainUpdate{
+		n2.ID: {
 			DrainStrategy: expectedDrain,
 		},
 	}

diff --git a/scheduler/reconcile.go b/scheduler/reconcile.go
@@ -436,7 +436,6 @@ func (a *allocReconciler) computeGroup(group string, all allocSet) bool {
 	if deploymentPlaceReady {
 		// Do all destructive updates
 		min := helper.IntMin(len(destructive), limit)
-		limit -= min
 		desiredChanges.DestructiveUpdate += uint64(min)
 		desiredChanges.Ignore += uint64(len(destructive) - min)
 		for _, alloc := range destructive.nameOrder()[:min] {

diff --git a/scheduler/reconcile_util_test.go b/scheduler/reconcile_util_test.go
@@ -36,16 +36,16 @@ func TestAllocSet_filterByTainted(t *testing.T) {
 	require := require.New(t)
 
 	nodes := map[string]*structs.Node{
-		"draining": &structs.Node{
+		"draining": {
 			ID:    "draining",
 			Drain: true,
 		},
-		"lost": &structs.Node{
+		"lost": {
 			ID:     "lost",
 			Status: structs.NodeStatusDown,
 		},
 		"nil": nil,
-		"normal": &structs.Node{
+		"normal": {
 			ID:     "normal",
 			Status: structs.NodeStatusReady,
 		},