Improve E2E tests performance

Author: sebastienros

src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs

@@ -33,7 +33,7 @@ public override async Task InitializeAsync()
         // instance across tests (One of the tests closes the browser). For that reason we simply create
         // a new browser instance for every test in this class sos that there are no issues when running
         // them together.
-        await base.InitializeAsync(Guid.NewGuid().ToString());
+        await base.InitializeAsync(null);
     }
 
     protected override void InitializeAsyncCore()

src/Components/test/E2ETest/ServerExecutionTests/HotReloadTest.cs

@@ -24,7 +24,7 @@ public HotReloadTest(
 
     public override async Task InitializeAsync()
     {
-        await base.InitializeAsync(Guid.NewGuid().ToString());
+        await base.InitializeAsync(null);
     }
 
     protected override void InitializeAsyncCore()

src/Components/test/E2ETest/ServerExecutionTests/ProtectedBrowserStorageUsageTest.cs

@@ -26,7 +26,7 @@ public override async Task InitializeAsync()
     {
         // Since browser storage needs to be reset in between tests, it's easiest for each
         // test to run in its own browser instance.
-        await base.InitializeAsync(Guid.NewGuid().ToString());
+        await base.InitializeAsync(null);
     }
 
     protected override void InitializeAsyncCore()

src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs

@@ -39,7 +39,7 @@ protected override void InitializeAsyncCore()
         _appElement = Browser.MountTestComponent<BinaryHttpRequestsComponent>();
     }
 
-    public override Task InitializeAsync() => base.InitializeAsync(Guid.NewGuid().ToString());
+    public override Task InitializeAsync() => base.InitializeAsync(null);
 
     [Fact]
     public void CanSendAndReceiveBytes()

src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs

@@ -32,7 +32,7 @@ public BootResourceCachingTest(
 
     public override Task InitializeAsync()
     {
-        return base.InitializeAsync(Guid.NewGuid().ToString());
+        return base.InitializeAsync(null);
     }
 
     [Fact]

src/Components/test/E2ETest/Tests/PerformanceTest.cs

@@ -25,7 +25,7 @@ protected override void InitializeAsyncCore()
         Navigate("/");
     }
 
-    public override Task InitializeAsync() => base.InitializeAsync(Guid.NewGuid().ToString());
+    public override Task InitializeAsync() => base.InitializeAsync(null);
 
     [Fact]
     public void HasTitle()

src/Components/test/E2ETest/Tests/SignalRClientTest.cs

@@ -35,7 +35,7 @@ protected override void InitializeAsyncCore()
         Browser.Exists(By.Id("signalr-client"));
     }
 
-    public override Task InitializeAsync() => base.InitializeAsync(Guid.NewGuid().ToString());
+    public override Task InitializeAsync() => base.InitializeAsync(null);
 
     [Fact]
     public void SignalRClientWorksWithLongPolling()

src/Shared/E2ETesting/BrowserFixture.cs

@@ -14,6 +14,7 @@ namespace Microsoft.AspNetCore.E2ETesting;
 public class BrowserFixture : IAsyncLifetime
 {
     public static string StreamingContext { get; } = "streaming";
+
     private readonly ConcurrentDictionary<string, (IWebDriver browser, ILogs log)> _browsers = new();
 
     public BrowserFixture(IMessageSink diagnosticsMessageSink)
@@ -39,7 +40,7 @@ public static void EnforceSupportedConfigurations()
 
     public static bool IsHostAutomationSupported()
     {
-        // We emit an assemblymetadata attribute that reflects the value of SeleniumE2ETestsSupported at build
+        // We emit an AssemblyMetadata attribute that reflects the value of SeleniumE2ETestsSupported at build
         // time and we use that to conditionally skip Selenium tests parts.
         var attribute = typeof(BrowserFixture).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
             .SingleOrDefault(a => a.Key == "Microsoft.AspNetCore.InternalTesting.Selenium.Supported");
@@ -66,8 +67,15 @@ public async Task DisposeAsync()
         var browsers = _browsers.Values;
         foreach (var (browser, _) in browsers)
         {
-            browser?.Quit();
-            browser?.Dispose();
+            try
+            {
+                browser?.Quit();
+                browser?.Dispose();
+            }
+            catch
+            {
+                // Continue disposing other browsers
+            }
         }
 
         await DeleteBrowserUserProfileDirectoriesAsync();
@@ -114,6 +122,11 @@ private async Task DeleteBrowserUserProfileDirectoriesAsync()
             return default;
         }
 
+        if (isolationContext == null)
+        {
+            return CreateBrowser(null, output);
+        }
+
         return _browsers.GetOrAdd(isolationContext, CreateBrowser, output);
     }
 

src/Shared/E2ETesting/BrowserTestBase.cs

@@ -16,6 +16,7 @@ public class BrowserTestBase : IClassFixture<BrowserFixture>, IAsyncLifetime
 
     private ExceptionDispatchInfo _exceptionDispatchInfo;
     private IWebDriver _browser;
+    protected string _isolationContext;
 
     public BrowserTestBase(BrowserFixture browserFixture, ITestOutputHelper output)
     {
@@ -51,6 +52,11 @@ public IWebDriver Browser
 
     public Task DisposeAsync()
     {
+        if (_isolationContext == null)
+        {
+            Browser.Dispose();
+        }
+
         return Task.CompletedTask;
     }
 
@@ -61,6 +67,8 @@ public virtual Task InitializeAsync()
 
     public virtual Task InitializeAsync(string isolationContext)
     {
+        // If isolationContext is null then the Browser is not cached
+
         InitializeBrowser(isolationContext);
         InitializeAsyncCore();
         return Task.CompletedTask;
@@ -74,11 +82,14 @@ protected void InitializeBrowser(string isolationContext)
     {
         try
         {
+            Browser?.Dispose();
+
             var (browser, logs) = BrowserFixture.GetOrCreateBrowser(Output, isolationContext);
             _asyncBrowser.Value = browser;
             _logs.Value = logs;
 
             Browser = browser;
+            _isolationContext = isolationContext;
         }
         catch (Exception ex)
         {