trying more

microsoft · Nov 11, 2024 · 5c25028 · 5c25028
1 parent 43c9e08
commit 5c25028
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/dotnet/src/Experimental/Process.IntegrationTestRunner.Dapr/AssemblyInfo.cs b/dotnet/src/Experimental/Process.IntegrationTestRunner.Dapr/AssemblyInfo.cs
@@ -0,0 +1 @@
+[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]
diff --git a/dotnet/src/Experimental/Process.IntegrationTestRunner.Dapr/ProcessTestFixture.cs b/dotnet/src/Experimental/Process.IntegrationTestRunner.Dapr/ProcessTestFixture.cs
@@ -14,15 +14,18 @@ public sealed class ProcessTestFixture : IDisposable, IAsyncLifetime
 {
     private System.Diagnostics.Process? _process;
     private HttpClient? _httpClient;
-    private string? _daprAppIdd;
 
     /// <summary>
     /// Called by xUnit before the test is run.
     /// </summary>
     /// <returns></returns>
     public async Task InitializeAsync()
     {
-        this._daprAppIdd = Guid.NewGuid().ToString("n");
+        if (this._process is not null && !this._process.HasExited)
+        {
+            return;
+        }
+
         this._httpClient = new HttpClient();
         await this.StartTestHostAsync();
     }
@@ -35,11 +38,11 @@ private async Task StartTestHostAsync()
     {
         try
         {
-            string workingDirectory = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), @"../../../../Process.IntegrationTestHost.Dapr"));
+            string workingDirectory = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), "../../../../Process.IntegrationTestHost.Dapr"));
             var processStartInfo = new ProcessStartInfo
             {
                 FileName = "dapr",
-                Arguments = $"run --app-id {this._daprAppIdd!} --app-port 5200 --dapr-http-port 3500 -- dotnet run --urls http://localhost:5200",
+                Arguments = $"run --app-id daprprocesstests --app-port 5200 --dapr-http-port 3500 -- dotnet run --urls http://localhost:5200",
                 WorkingDirectory = workingDirectory,
                 RedirectStandardOutput = false,
                 RedirectStandardError = false,
@@ -66,7 +69,7 @@ private async Task ShutdownTestHostAsync()
         var processStartInfo = new ProcessStartInfo
         {
             FileName = "dapr",
-            Arguments = $"stop --app-id {this._daprAppIdd}",
+            Arguments = $"stop --app-id daprprocesstests",
             RedirectStandardOutput = false,
             RedirectStandardError = false,
             UseShellExecute = true,