test: Fix badly formatted retry.Run tests

command/agent/event_endpoint_test.go

@@ -318,12 +318,9 @@ func TestEventList_EventBufOrder(t *testing.T) {
 				t.Fatalf("err: %v", err)
 			}
 		}
-		retry.
-
 		// Test that the event order is preserved when name
 		// filtering on a list of > 1 matching event.
-			Run(t, func(r *retry.R) {
+		retry.Run(t, func(r *retry.R) {
-
 			url := "/v1/event/list?name=foo"
 			req, err := http.NewRequest("GET", url, nil)
 			if err != nil {
@@ -342,7 +339,6 @@ func TestEventList_EventBufOrder(t *testing.T) {
 				r.Fatalf("bad: %#v", list)
 			}
 		})
-
 	})
 }
 

command/agent/health_endpoint_test.go

@@ -167,11 +167,8 @@ func TestHealthChecksInState_DistanceSort(t *testing.T) {
 	if err := srv.agent.RPC("Coordinate.Update", &arg, &out); err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	retry.
-
 	// Retry until foo moves to the front of the line.
-		Run(t, func(r *retry.R) {
+	retry.Run(t, func(r *retry.R) {
-
 		resp = httptest.NewRecorder()
 		obj, err = srv.HealthChecksInState(resp, req)
 		if err != nil {
@@ -189,7 +186,6 @@ func TestHealthChecksInState_DistanceSort(t *testing.T) {
 			r.Fatalf("bad: %v", nodes)
 		}
 	})
-
 }
 
 func TestHealthNodeChecks(t *testing.T) {
@@ -428,11 +424,8 @@ func TestHealthServiceChecks_DistanceSort(t *testing.T) {
 	if err := srv.agent.RPC("Coordinate.Update", &arg, &out); err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	retry.
-
 	// Retry until foo has moved to the front of the line.
-		Run(t, func(r *retry.R) {
+	retry.Run(t, func(r *retry.R) {
-
 		resp = httptest.NewRecorder()
 		obj, err = srv.HealthServiceChecks(resp, req)
 		if err != nil {
@@ -450,7 +443,6 @@ func TestHealthServiceChecks_DistanceSort(t *testing.T) {
 			r.Fatalf("bad: %v", nodes)
 		}
 	})
-
 }
 
 func TestHealthServiceNodes(t *testing.T) {
@@ -662,11 +654,8 @@ func TestHealthServiceNodes_DistanceSort(t *testing.T) {
 	if err := srv.agent.RPC("Coordinate.Update", &arg, &out); err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	retry.
-
 	// Retry until foo has moved to the front of the line.
-		Run(t, func(r *retry.R) {
+	retry.Run(t, func(r *retry.R) {
-
 		resp = httptest.NewRecorder()
 		obj, err = srv.HealthServiceNodes(resp, req)
 		if err != nil {
@@ -684,7 +673,6 @@ func TestHealthServiceNodes_DistanceSort(t *testing.T) {
 			r.Fatalf("bad: %v", nodes)
 		}
 	})
-
 }
 
 func TestHealthServiceNodes_PassingFilter(t *testing.T) {

command/agent/local_test.go

@@ -1289,11 +1289,8 @@ func TestAgentAntiEntropy_NodeInfo(t *testing.T) {
 		Node:       agent.config.NodeName,
 	}
 	var services structs.IndexedNodeServices
-	retry.
-
 	// Wait for the sync
-		Run(t, func(r *retry.R) {
+	retry.Run(t, func(r *retry.R) {
-
 		if err := agent.RPC("Catalog.NodeServices", &req, &services); err != nil {
 			r.Fatalf("err: %v", err)
 		}
@@ -1317,12 +1314,8 @@ func TestAgentAntiEntropy_NodeInfo(t *testing.T) {
 
 	// Trigger anti-entropy run and wait
 	agent.StartSync()
-	retry.
+	// Wait for the sync - this should have been a sync of just the node info
-
+	retry.Run(t, func(r *retry.R) {
-		// Wait for the sync - this should have been a sync of just the
-		// node info
-		Run(t, func(r *retry.R) {
-
 		if err := agent.RPC("Catalog.NodeServices", &req, &services); err != nil {
 			r.Fatalf("err: %v", err)
 		}
@@ -1336,7 +1329,6 @@ func TestAgentAntiEntropy_NodeInfo(t *testing.T) {
 			r.Fatalf("bad: %v", services.NodeServices.Node)
 		}
 	})
-
 }
 
 func TestAgentAntiEntropy_deleteService_fails(t *testing.T) {

consul/autopilot_test.go

@@ -239,13 +239,10 @@ func TestAutopilot_PromoteNonVoter(t *testing.T) {
 	}
 
 	testrpc.WaitForLeader(t, s1.RPC, "dc1")
-	retry.
-
 	// Wait for the new server to be added as a non-voter, but make sure
 	// it doesn't get promoted to a voter even after ServerStabilizationTime,
 	// because that would result in an even-numbered quorum count.
-		Run(t, func(r *retry.R) {
+	retry.Run(t, func(r *retry.R) {
-
 		future := s1.raft.GetConfiguration()
 		if err := future.Error(); err != nil {
 			r.Fatal(err)

consul/catalog_endpoint_test.go

@@ -676,17 +676,13 @@ func TestCatalog_ListNodes_NodeMetaFilter(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
-	retry.
-
 	// Should get an empty list of nodes back
-		Run(t, func(r *retry.R) {
+	retry.Run(t, func(r *retry.R) {
-
 		msgpackrpc.CallWithCodec(codec, "Catalog.ListNodes", &args, &out)
 		if len(out.Nodes) != 0 {
 			r.Fatal(nil)
 		}
 	})
-
 }
 
 func TestCatalog_ListNodes_StaleRaad(t *testing.T) {