Merge pull request #287 from benlangmuir/test-serial-fix

[test] Fix notification handler test when run in serial

Author: benlangmuir

Package.swift

@@ -126,6 +126,7 @@ let package = Package(
         dependencies: [
           "SourceKitD",
           "SKCore",
+          "SKTestSupport",
         ]
       ),
 

Tests/SourceKitDTests/SourceKitDTests.swift

@@ -14,6 +14,8 @@ import SourceKitD
 import SKCore
 import TSCBasic
 import TSCUtility
+import ISDBTibs
+import ISDBTestSupport
 import XCTest
 
 final class SourceKitDTests: XCTestCase {
@@ -31,26 +33,38 @@ final class SourceKitDTests: XCTestCase {
   }
 
   func testMultipleNotificationHandlers() {
+    let ws = try! mutableTibsTestWorkspace(name: "proj1")!
     let sourcekitd = try! SourceKitDImpl.getOrCreate(dylibPath: SourceKitDTests.sourcekitdPath)
     let keys = sourcekitd.keys
+    let path: String = ws.testLoc("c").url.path
+
+    let isExpectedNotification = { (response: SKDResponse) -> Bool in
+      if let notification: sourcekitd_uid_t = response.value?[keys.notification],
+         let name: String = response.value?[keys.name]
+      {
+        return name == path && notification == sourcekitd.values.notification_documentupdate
+      }
+      return false
+    }
 
     let expectation1 = expectation(description: "handler 1")
     let handler1 = ClosureNotificationHandler { response in
-      XCTAssertEqual(response.value?[keys.notification], sourcekitd.values.notification_documentupdate)
-      expectation1.fulfill()
+      if isExpectedNotification(response) {
+        expectation1.fulfill()
+      }
     }
     sourcekitd.addNotificationHandler(handler1)
 
     let expectation2 = expectation(description: "handler 2")
     let handler2 = ClosureNotificationHandler { response in
-      XCTAssertEqual(response.value?[keys.notification], sourcekitd.values.notification_documentupdate)
-      expectation2.fulfill()
+      if isExpectedNotification(response) {
+        expectation2.fulfill()
+      }
     }
     sourcekitd.addNotificationHandler(handler2)
 
     let req = SKDRequestDictionary(sourcekitd: sourcekitd)
     req[keys.request] = sourcekitd.requests.editor_open
-    let path: String = #file
     req[keys.name] = path
     req[keys.sourcetext] = """
       func foo() {}

Utilities/build-script-helper.py

@@ -101,6 +101,7 @@ def handle_invocation(swift_exec, args):
   env = os.environ
   # Set the toolchain used in tests at runtime
   env['SOURCEKIT_TOOLCHAIN_PATH'] = args.toolchain
+  env['INDEXSTOREDB_TOOLCHAIN_BIN_PATH'] = args.toolchain
   # Use local dependencies (i.e. checked out next sourcekit-lsp).
   if not args.no_local_deps:
     env['SWIFTCI_USE_LOCAL_DEPS'] = "1"