Use unique ports in tests

dotnet · Nov 6, 2024 · d59fa95 · d59fa95
1 parent 6f18df2
commit d59fa95
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json b/src/BuiltInTools/dotnet-watch/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "dotnet-watch": {
       "commandName": "Project",
       "commandLineArgs": "--verbose /bl:DotnetRun.binlog",
-      "workingDirectory": "C:\\Temp\\Aspire4\\Aspire4.AppHost",
+      "workingDirectory": "C:\\sdk\\artifacts\\tmp\\Debug\\BlazorWasm_Ap---8DA5F107",
       "environmentVariables": {
         "DOTNET_WATCH_DEBUG_SDK_DIRECTORY": "$(RepoRoot)artifacts\\bin\\redist\\$(Configuration)\\dotnet\\sdk\\$(Version)"
       }

diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs
@@ -190,13 +190,14 @@ public async Task BlazorWasm()
             var testAsset = TestAssets.CopyTestAsset("WatchBlazorWasm")
                 .WithSource();
 
-            App.Start(testAsset, [], testFlags: TestFlags.MockBrowser);
+            var port = TestOptions.GetTestPort();
+            App.Start(testAsset, ["--urls", "http://localhost:" + port], testFlags: TestFlags.MockBrowser);
 
             await App.AssertWaitingForChanges();
 
             App.AssertOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh);
             App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser);
-            App.AssertOutputContains("dotnet watch ⌚ Launching browser: http://localhost:5000/");
+            App.AssertOutputContains($"dotnet watch ⌚ Launching browser: http://localhost:{port}/");
 
             var newSource = """
                 @page "/"
@@ -222,7 +223,8 @@ public async Task BlazorWasm_MSBuildWarning()
                             """));
                 });
 
-            App.Start(testAsset, [], testFlags: TestFlags.MockBrowser);
+            var port = TestOptions.GetTestPort();
+            App.Start(testAsset, ["--urls", "http://localhost:" + port], testFlags: TestFlags.MockBrowser);
 
             await App.AssertOutputLineStartsWith("dotnet watch ⚠ msbuild: [Warning] Duplicate source file");
             await App.AssertWaitingForChanges();

diff --git a/test/dotnet-watch.Tests/Utilities/TestOptions.cs b/test/dotnet-watch.Tests/Utilities/TestOptions.cs
@@ -7,6 +7,11 @@ namespace Microsoft.DotNet.Watcher;
 
 internal static class TestOptions
 {
+    private static int s_testPort = 7000;
+
+    public static int GetTestPort()
+        => Interlocked.Increment(ref s_testPort);
+
     public static readonly ProjectOptions ProjectOptions = GetProjectOptions([]);
 
     public static EnvironmentOptions GetEnvironmentOptions(string workingDirectory = "", string muxerPath = "")