test: further resilience improvement for language-server tests

dev-cycles · Nov 27, 2023 · 7783490 · 7783490
1 parent 8e74099
commit 7783490
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/src/language-server/Contextive.LanguageServer.Tests/DefinitionsTests.fs b/src/language-server/Contextive.LanguageServer.Tests/DefinitionsTests.fs
@@ -161,14 +161,14 @@ let tests =
 
                   let pathLoader () : obj = path
 
-                  let logAwaiter = ConditionAwaiter.create ()
-
                   let config =
                       [ Workspace.optionsBuilder <| Path.Combine("fixtures", "completion_tests")
-                        ConfigurationSection.contextivePathLoaderBuilder pathLoader
-                        ServerLog.optionsBuilder logAwaiter ]
+                        ConfigurationSection.contextivePathLoaderBuilder pathLoader ]
+
+                  let! (client, _, logAwaiter) =
+                      TestClientWithCustomInitWait(config, Some "Successfully loaded.")
+                      |> initAndWaitForReply
 
-                  let! (client, logAwaiter) = TestClient(config) |> initAndGetLogAwaiter
                   use client = client
 
                   let! termsWhenValidAtStart = Completion.getCompletionLabels client

diff --git a/src/language-server/Contextive.LanguageServer.Tests/Helpers/ConditionAwaiter.fs b/src/language-server/Contextive.LanguageServer.Tests/Helpers/ConditionAwaiter.fs
@@ -84,4 +84,4 @@ let waitForAnyTimeout timeoutMs (awaiter: Awaiter<'T>) =
 let waitForAny awaiter =
     waitForAnyTimeout DEFAULT_TIMEOUT_MS awaiter
 
-let clear (awaiter: Awaiter<'T>) timeout = awaiter.Post(Clear)
+let clear (awaiter: Awaiter<'T>) = awaiter.Post(Clear)
diff --git a/src/language-server/Contextive.LanguageServer.Tests/Helpers/ConfigurationSection.fs b/src/language-server/Contextive.LanguageServer.Tests/Helpers/ConfigurationSection.fs
@@ -101,5 +101,5 @@ let didChangePath (client: ILanguageClient) path (logAwaiter: ConditionAwaiter.A
 
         match logAwaiter with
         | None -> ()
-        | Some la -> ConditionAwaiter.clear la 500
+        | Some la -> ConditionAwaiter.clear la
     }
diff --git a/src/language-server/Contextive.LanguageServer.Tests/Helpers/TestClient.fs b/src/language-server/Contextive.LanguageServer.Tests/Helpers/TestClient.fs
@@ -60,6 +60,8 @@ let private initAndWaitForConfigLoaded testClientConfig (loadMessage: string opt
             (defaultArg loadMessage "Loading contextive")
             |> ServerLog.waitForLogMessage logAwaiter
 
+        ConditionAwaiter.clear logAwaiter
+
         return (client, reply, Some logAwaiter)
     }
 

diff --git a/src/language-server/Contextive.LanguageServer.Tests/WatchedFilesTests.fs b/src/language-server/Contextive.LanguageServer.Tests/WatchedFilesTests.fs
@@ -60,20 +60,17 @@ let tests =
                   let mutable definitionsFile = "one.yml"
                   let pathLoader () : obj = definitionsFile
 
-                  let logAwaiter = ConditionAwaiter.create ()
-
                   let config =
                       [ Workspace.optionsBuilder <| Path.Combine("fixtures", "completion_tests")
                         ConfigurationSection.contextivePathLoaderBuilder pathLoader
-                        WatchedFiles.optionsBuilder registrationAwaiter
-                        ServerLog.optionsBuilder logAwaiter ]
+                        WatchedFiles.optionsBuilder registrationAwaiter ]
 
                   let! (client, logAwaiter) = TestClient(config) |> initAndGetLogAwaiter
                   use client = client
 
                   let! initialRegistrationMsg = ConditionAwaiter.waitForAny registrationAwaiter
 
-                  ConditionAwaiter.clear registrationAwaiter 500
+                  ConditionAwaiter.clear registrationAwaiter
 
                   definitionsFile <- newDefinitionsFile
                   do! ConfigurationSection.didChangePath client definitionsFile logAwaiter

diff --git a/src/language-server/Contextive.LanguageServer.Tests/fixtures/completion_tests/three.yml b/src/language-server/Contextive.LanguageServer.Tests/fixtures/completion_tests/three.yml
@@ -46,4 +46,5 @@ contexts:
     - name: newterm
     - name: newterm
     - name: newterm
+    - name: newterm
     - name: newterm
diff --git a/src/language-server/Contextive.LanguageServer/Definitions.fs b/src/language-server/Contextive.LanguageServer/Definitions.fs
@@ -100,7 +100,7 @@ module private Handle =
             let newState =
                 match defs with
                 | Ok defs ->
-                    state.Logger "Succesfully loaded."
+                    state.Logger "Successfully loaded."
                     { state with Definitions = defs }
                 | Error msg ->
                     let msg = $"Error loading definitions: {msg}"