internal/lsp/*_test.go: replace for+success pattern (#1248)

It's no functional change, just makes the code a little more concise.

Signed-off-by: Stephan Renatus <[email protected]>

internal/lsp/server_aggregates_test.go

@@ -57,8 +57,7 @@ import rego.v1
 	defer timeout.Stop()
 
 	// no unresolved-imports at this stage
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case violations := <-messages["foo.rego"]:
 			if slices.Contains(violations, "unresolved-import") {
@@ -71,10 +70,6 @@ import rego.v1
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for expected foo.rego diagnostics")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	barURI := fileURIScheme + filepath.Join(tempDir, "bar.rego")
@@ -99,8 +94,7 @@ import rego.v1
 	// unresolved-imports is now expected
 	timeout.Reset(determineTimeout())
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case violations := <-messages["foo.rego"]:
 			if !slices.Contains(violations, "unresolved-import") {
@@ -113,10 +107,6 @@ import rego.v1
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for expected foo.rego diagnostics")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	fooURI := fileURIScheme + filepath.Join(tempDir, "foo.rego")
@@ -144,8 +134,7 @@ import data.qux # new name for bar.rego package
 	// unresolved-imports is again not expected
 	timeout.Reset(determineTimeout())
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case violations := <-messages["foo.rego"]:
 			if slices.Contains(violations, "unresolved-import") {
@@ -158,10 +147,6 @@ import data.qux # new name for bar.rego package
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for expected foo.rego diagnostics")
 		}
-
-		if success {
-			break
-		}
 	}
 }
 
@@ -206,9 +191,7 @@ import data.quz
 	ticker := time.NewTicker(500 * time.Millisecond)
 	defer ticker.Stop()
 
-	for {
-		success := false
-
+	for success := false; !success; {
 		select {
 		case <-ticker.C:
 			aggs := ls.cache.GetFileAggregates()
@@ -222,10 +205,6 @@ import data.quz
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for file aggregates to be set")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	determineImports := func(aggs map[string][]report.Aggregate) []string {
@@ -292,9 +271,7 @@ import data.wow # new
 
 	timeout.Reset(determineTimeout())
 
-	for {
-		success := false
-
+	for success := false; !success; {
 		select {
 		case <-ticker.C:
 			imports = determineImports(ls.cache.GetFileAggregates())
@@ -309,10 +286,6 @@ import data.wow # new
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for file aggregates to be set")
 		}
-
-		if success {
-			break
-		}
 	}
 }
 
@@ -358,8 +331,7 @@ import rego.v1
 	timeout := time.NewTimer(determineTimeout())
 	defer timeout.Stop()
 
-	for {
-		var success bool
+	for success := true; !success; {
 		select {
 		case violations := <-messages["foo.rego"]:
 			if !slices.Contains(violations, "unresolved-import") {
@@ -378,10 +350,6 @@ import rego.v1
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for foo.rego diagnostics")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	// update the contents of the bar.rego file to address the unresolved-import
@@ -407,8 +375,7 @@ import rego.v1
 	// wait for foo.rego to have the correct violations
 	timeout.Reset(determineTimeout())
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case violations := <-messages["foo.rego"]:
 			if slices.Contains(violations, "unresolved-import") {
@@ -427,10 +394,6 @@ import rego.v1
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for foo.rego diagnostics")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	// update the contents of the bar.rego to bring back the violation
@@ -454,8 +417,7 @@ import rego.v1
 	// check the violation is back
 	timeout.Reset(determineTimeout())
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case violations := <-messages["foo.rego"]:
 			if !slices.Contains(violations, "unresolved-import") {
@@ -474,9 +436,5 @@ import rego.v1
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for foo.rego diagnostics")
 		}
-
-		if success {
-			break
-		}
 	}
 }

internal/lsp/server_config_test.go

@@ -87,18 +87,13 @@ allow := true
 	timeout := time.NewTimer(determineTimeout())
 	defer timeout.Stop()
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case requestData := <-receivedMessages:
 			success = testRequestDataCodes(t, requestData, mainRegoFileURI, []string{"opa-fmt"})
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for file diagnostics to be sent")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	// User updates config file contents in parent directory that is not
@@ -120,18 +115,13 @@ allow := true
 	// validate that the client received a new, empty diagnostics notification for the file
 	timeout.Reset(determineTimeout())
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case requestData := <-receivedMessages:
 			success = testRequestDataCodes(t, requestData, mainRegoFileURI, []string{})
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for file diagnostics to be sent")
 		}
-
-		if success {
-			break
-		}
 	}
 }
 
@@ -164,8 +154,7 @@ func TestLanguageServerCachesEnabledRulesAndUsesDefaultConfig(t *testing.T) {
 	timeout := time.NewTimer(3 * time.Second)
 	ticker := time.NewTicker(500 * time.Millisecond)
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case <-ticker.C:
 			enabledRules := ls.getEnabledNonAggregateRules()
@@ -181,10 +170,6 @@ func TestLanguageServerCachesEnabledRulesAndUsesDefaultConfig(t *testing.T) {
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for enabled rules to be correct")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	err = os.MkdirAll(filepath.Join(tempDir, ".regal"), 0o755)
@@ -221,8 +206,7 @@ rules:
 
 	timeout.Reset(determineTimeout())
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case <-ticker.C:
 			enabledRules := ls.getEnabledNonAggregateRules()
@@ -244,10 +228,6 @@ rules:
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for enabled rules to be correct")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	configContents2 := `
@@ -270,8 +250,7 @@ rules:
 
 	timeout.Reset(determineTimeout())
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case <-ticker.C:
 			enabledRules := ls.getEnabledNonAggregateRules()
@@ -299,9 +278,5 @@ rules:
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for enabled rules to be correct")
 		}
-
-		if success {
-			break
-		}
 	}
 }

internal/lsp/server_multi_file_test.go

@@ -74,32 +74,28 @@ ignore:
 
 	// wait for the aggregate data to be set, required for correct lint in next
 	// step
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		default:
 			uri := "file://" + filepath.Join(tempDir, "admins.rego")
 
 			aggs := ls.cache.GetFileAggregates(uri)
 			if len(aggs) > 0 {
 				success = true
+
+				break // don't sleep
 			}
 
 			time.Sleep(500 * time.Millisecond)
 		case <-timeout.C:
 			t.Fatalf("timed out waiting admin aggregates to be set")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	timeout.Reset(determineTimeout())
 
 	// validate that the client received a diagnostics notification for authz.rego
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case violations := <-messages["authz.rego"]:
 			if !slices.Contains(violations, "prefer-package-imports") {
@@ -112,17 +108,12 @@ ignore:
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for authz.rego diagnostics to be sent")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	// validate that the client received a diagnostics notification for admins.rego
 	timeout.Reset(determineTimeout())
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case violations := <-messages["admins.rego"]:
 			if !slices.Contains(violations, "use-assignment-operator") {
@@ -135,10 +126,6 @@ ignore:
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for admins.rego diagnostics to be sent")
 		}
-
-		if success {
-			break
-		}
 	}
 
 	// 3. Client sends textDocument/didChange notification with new contents
@@ -171,8 +158,7 @@ allow if input.user in admins.users
 	// authz.rego should now have no violations
 	timeout.Reset(determineTimeout())
 
-	for {
-		var success bool
+	for success := false; !success; {
 		select {
 		case violations := <-messages["authz.rego"]:
 			if len(violations) > 0 {
@@ -185,9 +171,5 @@ allow if input.user in admins.users
 		case <-timeout.C:
 			t.Fatalf("timed out waiting for authz.rego diagnostics to be sent")
 		}
-
-		if success {
-			break
-		}
 	}
 }