test: Improve test resilience if startForUnitTests fails (#6645)

deephaven · Feb 13, 2025 · 98fcedc · 98fcedc
1 parent 953c91e
commit 98fcedc
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/server/src/main/java/io/deephaven/server/runner/DeephavenApiServer.java b/server/src/main/java/io/deephaven/server/runner/DeephavenApiServer.java
@@ -237,12 +237,17 @@ public void join() throws InterruptedException {
 
     void startForUnitTests() throws Exception {
         setInstance(this);
-        pluginRegistration.registerAll();
-        applicationInjector.run();
-        executionContextProvider.get().getQueryLibrary().updateVersionString("DEFAULT");
+        try {
+            pluginRegistration.registerAll();
+            applicationInjector.run();
+            executionContextProvider.get().getQueryLibrary().updateVersionString("DEFAULT");
 
-        log.info().append("Starting server...").endl();
-        server.start();
+            log.info().append("Starting server...").endl();
+            server.start();
+        } catch (Exception e) {
+            clearInstance(this);
+            throw e;
+        }
     }
 
     void teardownForUnitTests() throws InterruptedException {