Workaround for failing tests that seems to re-use the instance. Is that even supported?

ramonsmits · ramonsmits · commit c7760a50ecfc · 2025-03-13T15:55:02.000+01:00
diff --git a/src/ServiceControl.RavenDB/EmbeddedDatabase.cs b/src/ServiceControl.RavenDB/EmbeddedDatabase.cs
@@ -213,7 +213,7 @@ public async Task Stop(CancellationToken cancellationToken)
                 }
             }
 
-            EmbeddedServer.Instance = null!;
+            serverOptions = null!;
             Logger.Debug("Stopped RavenDB server");
         }
 
@@ -224,14 +224,14 @@ public void Dispose()
                 return;
             }
 
-            if (EmbeddedServer.Instance != null)
+            if (serverOptions != null)
             {
                 EmbeddedServer.Instance.ServerProcessExited -= OnServerProcessExited;
             }
 
             shutdownTokenSource.Cancel();
 
-            if (EmbeddedServer.Instance != null)
+            if (serverOptions != null)
             {
                 // Set GracefulShutdownTimeout to Zero and exist ASAP, under normal operation instance would already
                 // have been allowed to gracefully stop during "Stop" method.

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ public async Task Stop(CancellationToken cancellationToken)`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
`216`		`- EmbeddedServer.Instance = null!;`
	`216`	`+ serverOptions = null!;`
`217`	`217`	`Logger.Debug("Stopped RavenDB server");`
`218`	`218`	`}`
`219`	`219`
`@@ -224,14 +224,14 @@ public void Dispose()`
`224`	`224`	`return;`
`225`	`225`	`}`
`226`	`226`
`227`		`- if (EmbeddedServer.Instance != null)`
	`227`	`+ if (serverOptions != null)`
`228`	`228`	`{`
`229`	`229`	`EmbeddedServer.Instance.ServerProcessExited -= OnServerProcessExited;`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`shutdownTokenSource.Cancel();`
`233`	`233`
`234`		`- if (EmbeddedServer.Instance != null)`
	`234`	`+ if (serverOptions != null)`
`235`	`235`	`{`
`236`	`236`	`// Set GracefulShutdownTimeout to Zero and exist ASAP, under normal operation instance would already`
`237`	`237`	`// have been allowed to gracefully stop during "Stop" method.`