Merge pull request #1781 from ahoppen/no-timer-target-change

Don’t rely on timers for BSP target / settings change tests

Author: ahoppen

Sources/SKTestSupport/INPUTS/AbstractBuildServer.py

@@ -76,6 +76,8 @@ def handle_message(self, message: Dict[str, object]) -> Optional[Dict[str, objec
             return self.register_for_changes(params)
         elif method == "textDocument/sourceKitOptions":
             return self.textdocument_sourcekitoptions(params)
+        elif method == "workspace/didChangeWatchedFiles":
+            return self.workspace_did_change_watched_files(params)
         elif method == "workspace/buildTargets":
             return self.workspace_build_targets(params)
 
@@ -147,6 +149,9 @@ def buildtarget_sources(self, request: Dict[str, object]) -> Dict[str, object]:
             code=-32601, message=f"'buildTarget/sources' not implemented"
         )
 
+    def workspace_did_change_watched_files(self, notification: Dict[str, object]) -> None:
+        pass
+
     def workspace_build_targets(self, request: Dict[str, object]) -> Dict[str, object]:
         raise RequestError(
             code=-32601, message=f"'workspace/buildTargets' not implemented"

Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift

@@ -89,17 +89,11 @@ final class BuildServerBuildSystemTests: XCTestCase {
         """
       ],
       buildServer: """
-        import threading
-
         class BuildServer(AbstractBuildServer):
-          timer_has_fired: bool = False
-
-          def timer_fired(self):
-            self.timer_has_fired = True
-            self.send_notification("buildTarget/didChange", {})
+          has_changed_targets: bool = False
 
           def workspace_build_targets(self, request: Dict[str, object]) -> Dict[str, object]:
-            if self.timer_has_fired:
+            if self.has_changed_targets:
               return {
                 "targets": [
                   {
@@ -112,11 +106,10 @@ final class BuildServerBuildSystemTests: XCTestCase {
                 ]
               }
             else:
-              threading.Timer(1, self.timer_fired).start()
               return {"targets": []}
 
           def buildtarget_sources(self, request: Dict[str, object]) -> Dict[str, object]:
-            assert self.timer_has_fired
+            assert self.has_changed_targets
             return {
               "items": [
                 {
@@ -129,10 +122,14 @@ final class BuildServerBuildSystemTests: XCTestCase {
             }
 
           def textdocument_sourcekitoptions(self, request: Dict[str, object]) -> Dict[str, object]:
-            assert self.timer_has_fired
+            assert self.has_changed_targets
             return {
               "compilerArguments": [r"$TEST_DIR/Test.swift", "-DDEBUG", $SDK_ARGS]
             }
+
+          def workspace_did_change_watched_files(self, notification: Dict[str, object]) -> None:
+            self.has_changed_targets = True
+            self.send_notification("buildTarget/didChange", {})
         """
     )
 
@@ -144,6 +141,13 @@ final class BuildServerBuildSystemTests: XCTestCase {
     )
     XCTAssertEqual(initialDiagnostics.fullReport?.items, [])
 
+    // We use an arbitrary file change to signal to the BSP server that it should send the targets changed notification
+    project.testClient.send(
+      DidChangeWatchedFilesNotification(changes: [
+        FileEvent(uri: try DocumentURI(string: "file:///dummy"), type: .created)
+      ])
+    )
+
     // But then the 1s timer in the build server should fire, we get a `buildTarget/didChange` notification and we have
     // build settings for Test.swift
     try await repeatUntilExpectedResult {
@@ -168,14 +172,8 @@ final class BuildServerBuildSystemTests: XCTestCase {
         """
       ],
       buildServer: """
-        import threading
-
         class BuildServer(AbstractBuildServer):
-          timer_has_fired: bool = False
-
-          def timer_fired(self):
-            self.timer_has_fired = True
-            self.send_notification("buildTarget/didChange", {})
+          has_changed_settings: bool = False
 
           def workspace_build_targets(self, request: Dict[str, object]) -> Dict[str, object]:
             return {
@@ -203,15 +201,18 @@ final class BuildServerBuildSystemTests: XCTestCase {
             }
 
           def textdocument_sourcekitoptions(self, request: Dict[str, object]) -> Dict[str, object]:
-            if self.timer_has_fired:
+            if self.has_changed_settings:
               return {
                 "compilerArguments": [r"$TEST_DIR/Test.swift", "-DDEBUG", $SDK_ARGS]
               }
             else:
-              threading.Timer(1, self.timer_fired).start()
               return {
                 "compilerArguments": [r"$TEST_DIR/Test.swift", $SDK_ARGS]
               }
+
+          def workspace_did_change_watched_files(self, notification: Dict[str, object]) -> None:
+            self.has_changed_settings = True
+            self.send_notification("buildTarget/didChange", {})
         """
     )
 
@@ -223,6 +224,13 @@ final class BuildServerBuildSystemTests: XCTestCase {
     )
     XCTAssertEqual(initialDiagnostics.fullReport?.items.map(\.message), ["DEBUG NOT SET"])
 
+    // We use an arbitrary file change to signal to the BSP server that it should send the targets changed notification
+    project.testClient.send(
+      DidChangeWatchedFilesNotification(changes: [
+        FileEvent(uri: try DocumentURI(string: "file:///dummy"), type: .created)
+      ])
+    )
+
     // But then the 1s timer in the build server should fire, we get a `buildTarget/didChange` notification and we get
     // build settings for Test.swift that include -DDEBUG
     try await repeatUntilExpectedResult {