From 882c295bdc63615f25a3bec482b5eabac9ed9094 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Fri, 11 Aug 2023 13:16:59 +0200 Subject: [PATCH 1/2] make test faster after https://github.com/dotnet/runtime/pull/90264 --- .../HostedInAspNet.Client/wwwroot/index.html | 5 +++++ .../test/E2ETest/Tests/BootResourceCachingTest.cs | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html index 643b68bb6bd6..aef98e3b9c2f 100644 --- a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html +++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/wwwroot/index.html @@ -19,6 +19,11 @@ return type === 'dotnetjs' ? `${defaultUri}?customizedbootresource=true` : fetch(defaultUri, { integrity: integrity, cache: 'no-cache', headers: { 'customizedbootresource': 'true' } }); + }, + configureRuntime: function (builder) { + builder.withConfig({ + cachedResourcesPurgeDelay: 0 + }); } }); diff --git a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs index d878f2145d3f..ad30ce3ad32c 100644 --- a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs +++ b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs @@ -91,9 +91,17 @@ public async Task IncrementallyUpdatesCache() requestedDll => Assert.Contains("/Microsoft.AspNetCore.Components.wasm", requestedDll), requestedDll => Assert.Contains("/dotnet.native.wasm", requestedDll)); - // We also update the cache (add new items, remove unnecessary items) - await Task.Delay(10500); // wait for cache purge, which is 10 seconds delayed after app start - var cacheEntryUrls3 = GetCacheEntryUrls(); + var cacheEntryUrls3=GetCacheEntryUrls(); + // wait until the cache was cleaned, max 500ms + for(int i=0; i<5; i++) + { + if(!cacheEntryUrls3.Contains(cacheEntryForDotNetWasmWithChangedHash)) + { + break; + } + await Task.Delay(100); // wait for cache purge + cacheEntryUrls3 = GetCacheEntryUrls(); + } Assert.Contains(cacheEntryForComponentsDll, cacheEntryUrls3); Assert.Contains(cacheEntryForDotNetWasm, cacheEntryUrls3); Assert.DoesNotContain(cacheEntryForDotNetWasmWithChangedHash, cacheEntryUrls3); From 59af3d0cc70d50470fad134d1b96b84a0d3594a2 Mon Sep 17 00:00:00 2001 From: Pavel Savara Date: Fri, 11 Aug 2023 20:35:43 +0200 Subject: [PATCH 2/2] Update src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs Co-authored-by: Mackinnon Buck --- .../test/E2ETest/Tests/BootResourceCachingTest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs index ad30ce3ad32c..186462f757e5 100644 --- a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs +++ b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs @@ -91,11 +91,11 @@ public async Task IncrementallyUpdatesCache() requestedDll => Assert.Contains("/Microsoft.AspNetCore.Components.wasm", requestedDll), requestedDll => Assert.Contains("/dotnet.native.wasm", requestedDll)); - var cacheEntryUrls3=GetCacheEntryUrls(); + var cacheEntryUrls3 = GetCacheEntryUrls(); // wait until the cache was cleaned, max 500ms - for(int i=0; i<5; i++) + for (var i = 0; i < 5; i++) { - if(!cacheEntryUrls3.Contains(cacheEntryForDotNetWasmWithChangedHash)) + if (!cacheEntryUrls3.Contains(cacheEntryForDotNetWasmWithChangedHash)) { break; }