Try self-contained

Author: pranavkm

src/Components/benchmarkapps/Wasm.Performance/Driver/BenchmarkResultsStartup.cs

@@ -5,6 +5,7 @@
 using System.Text.Json;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
@@ -22,12 +23,13 @@ public void Configure(IApplicationBuilder app)
         {
             app.UseCors();
 
-            app.Run(async request =>
+            app.Run(async context =>
             {
-                var result = await JsonSerializer.DeserializeAsync<List<BenchmarkResult>>(request.Request.Body, new JsonSerializerOptions
+                var result = await JsonSerializer.DeserializeAsync<List<BenchmarkResult>>(context.Request.Body, new JsonSerializerOptions
                 {
                     PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
                 });
+                await context.Response.WriteAsync("OK");
                 Program.SetBenchmarkResult(result);
             });
         }

src/Components/benchmarkapps/Wasm.Performance/Driver/Program.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.ExceptionServices;
@@ -40,8 +39,10 @@ public static async Task<int> Main(string[] args)
             // This write is required for the benchmarking infrastructure.
             Console.WriteLine("Application started.");
 
-            using var browser = await Selenium.CreateBrowser(seleniumPort);
+            var cancellationToken = new CancellationTokenSource(Timeout);
+            cancellationToken.Token.Register(() => benchmarkResult.TrySetException(new TimeoutException($"Timed out after {Timeout}")));
 
+            using var browser = await Selenium.CreateBrowser(seleniumPort, cancellationToken.Token);
             using var testApp = StartTestApp();
             using var benchmarkReceiver = StartBenchmarkResultReceiver();
 
@@ -54,9 +55,6 @@ public static async Task<int> Main(string[] args)
             browser.Url = launchUrl;
             browser.Navigate();
 
-            var cancellationToken = new CancellationTokenSource(Timeout);
-            cancellationToken.Token.Register(() => benchmarkResult.TrySetException(new TimeoutException($"Timed out after {Timeout}")));
-
             var results = await benchmarkResult.Task;
             FormatAsBenchmarksOutput(results);
 

src/Components/benchmarkapps/Wasm.Performance/Driver/Selenium.cs

@@ -2,8 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
@@ -14,8 +16,9 @@ namespace Wasm.Performance.Driver
     class Selenium
     {
         static bool RunHeadlessBrowser = true;
+        static bool PoolForBrowserLogs = true;
 
-        private static async ValueTask<Uri> WaitForServerAsync(int port)
+        private static async ValueTask<Uri> WaitForServerAsync(int port, CancellationToken cancellationToken)
         {
             var uri = new UriBuilder("http", "localhost", port, "/wd/hub/").Uri;
             var httpClient = new HttpClient
@@ -34,7 +37,7 @@ private static async ValueTask<Uri> WaitForServerAsync(int port)
                 retries++;
                 try
                 {
-                    var response = (await httpClient.GetAsync("status")).EnsureSuccessStatusCode();
+                    var response = (await httpClient.GetAsync("status", cancellationToken)).EnsureSuccessStatusCode();
                     Console.WriteLine("Connected to Selenium");
                     return uri;
                 }
@@ -52,9 +55,9 @@ private static async ValueTask<Uri> WaitForServerAsync(int port)
             throw new Exception($"Unable to connect to selenium-server at {uri}");
         }
 
-        public static async Task<RemoteWebDriver> CreateBrowser(int port)
+        public static async Task<RemoteWebDriver> CreateBrowser(int port, CancellationToken cancellationToken)
         {
-            var uri = await WaitForServerAsync(port);
+            var uri = await WaitForServerAsync(port, cancellationToken);
 
             var options = new ChromeOptions();
 
@@ -82,6 +85,25 @@ public static async Task<RemoteWebDriver> CreateBrowser(int port)
 
                     driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(1);
 
+                    if (PoolForBrowserLogs)
+                    {
+                        // Run in background.
+                        var logs = new RemoteLogs(driver);
+                        _ = Task.Run(async () =>
+                        {
+                            while (!cancellationToken.IsCancellationRequested)
+                            {
+                                await Task.Delay(TimeSpan.FromSeconds(3));
+
+                                var consoleLogs = logs.GetLog(LogType.Browser);
+                                foreach (var entry in consoleLogs)
+                                {
+                                    Console.WriteLine($"[Browser Log]: {entry.Timestamp}: {entry.Message}");
+                                }
+                            }
+                        });
+                    }
+
                     return driver;
                 }
                 catch (Exception ex)

src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/benchmarks/index.js

@@ -1,7 +1,7 @@
 import { groups, BenchmarkEvent, onBenchmarkEvent } from './lib/minibench/minibench.js';
 import { HtmlUI } from './lib/minibench/minibench.ui.js';
-// import './appStartup.js';
-// import './renderList.js';
+import './appStartup.js';
+import './renderList.js';
 import './jsonHandling.js';
 
 new HtmlUI('E2E Performance', '#display');
@@ -21,6 +21,7 @@ if (location.href.indexOf('#automated') !== -1) {
           break;
         case BenchmarkEvent.benchmarkCompleted:
         case BenchmarkEvent.benchmarkError:
+          console.log(`Completed benchmark ${args.name}`);
           benchmarksResults.push(args);
           break;
         case BenchmarkEvent.runCompleted:

src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/benchmarks/lib/minibench/minibench.js

@@ -302,7 +302,7 @@ class Group extends EventEmitter {
 }
 
 const groups = [];
-let reportBenchmarkEvent;
+let reportBenchmarkEvent = () => {};
 
 function group(name, configure) {
     groups.push(new Group(name));

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

@@ -52,10 +52,8 @@ public void BenchmarksRunWithoutError()
                 () => runAllButton.Displayed || Browser.FindElements(By.CssSelector(".benchmark-error")).Any(),
                 TimeSpan.FromSeconds(60));
 
-            var finishedBenchmarks = Browser.FindElements(By.CssSelector(".benchmark-idle"));
-            var failedBenchmarks = Browser.FindElements(By.CssSelector(".benchmark-error"));
-            Assert.NotEmpty(finishedBenchmarks);
-            Assert.Empty(failedBenchmarks);
+            Browser.DoesNotExist(By.CssSelector(".benchmark-error")); // no failures
+            Browser.Exists(By.CssSelector(".benchmark-idle")); // everything's done
         }
     }
 }