Merge commit '5891ea97cdda63931f7d911d9c779d00eaf4f3bf'

julia-vscode · Feb 11, 2023 · 389eb9f · 389eb9f
2 parents 053086c + 5891ea9
commit 389eb9f
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/packages/TestItemServer/src/TestItemServer.jl b/packages/TestItemServer/src/TestItemServer.jl
@@ -144,8 +144,6 @@ function run_testitem_handler(conn, params::TestserverRunTestitemRequestParams)
         end
     end
 
-    @info "AND WE GOT PAST THIS"
-
     mod = Core.eval(Main, :(module $(gensym()) end))
 
     if params.useDefaultUsings
@@ -191,6 +189,26 @@ function run_testitem_handler(conn, params::TestserverRunTestitemRequestParams)
         end
     end
 
+    for i in params.testsetups
+        try
+            Core.eval(mod, :(using ..Testsetups: $(Symbol(i))))
+        catch
+            return TestserverRunTestitemRequestParamsReturn(
+                "errored",
+                [
+                    TestMessage(
+                        "Unable to load the `$i` testsetup.",
+                        Location(
+                            params.uri,
+                            Range(Position(params.line, 0), Position(params.line, 0))
+                        )
+                    )
+                ],
+                nothing
+            )
+        end
+    end
+
     filepath = uri2filepath(params.uri)
 
     code = string('\n'^params.line, ' '^params.column, params.code)