From c6f2b06a34401460433a783fcad46a40a4933056 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 20 Jul 2021 11:33:04 -0700 Subject: [PATCH 1/3] Skip, quarantine and un-Quarantine - un-quarantine `ContentLength_Received_MultipleDataFramesOverSize_Reset`, #33373 fix seems to have worked - quarantine `LoggingConnectionMiddlewareCanBeAddedBeforeAndAfterHttps()`, #34561 - skip `LongPollingTransportOnReceiveGetsCalled()` because we can't quarantine Java tests, #34563 --- .../test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs | 1 - .../InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs | 1 + .../java/com/microsoft/signalr/LongPollingTransportTest.java | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs index e87fadb9d8fa..c23fa6bc5a47 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs @@ -1080,7 +1080,6 @@ await InitializeConnectionAsync(async context => } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/33373")] public async Task ContentLength_Received_MultipleDataFramesOverSize_Reset() { IOException thrownEx = null; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs index 31539e50b3c8..e306af750e9f 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs @@ -14,6 +14,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests public class LoggingConnectionMiddlewareTests : LoggedTest { [Fact] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/34561")] public async Task LoggingConnectionMiddlewareCanBeAddedBeforeAndAfterHttps() { await using (var server = new TestServer(context => diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java index dbe25a562144..a263f8ee240f 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java @@ -125,6 +125,7 @@ public void CanSetAndTriggerOnReceive() { assertTrue(onReceivedRan.get()); } + @Ignore("https://github.com/dotnet/aspnetcore/issues/34563") @Test public void LongPollingTransportOnReceiveGetsCalled() { AtomicInteger requestCount = new AtomicInteger(); From 7b795663a11674bec8ac06a787710eaf439ddd09 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 20 Jul 2021 15:16:39 -0700 Subject: [PATCH 2/3] !fixup! Add missing `import` --- .../java/com/microsoft/signalr/LongPollingTransportTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java index a263f8ee240f..ac7ba383b45c 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java @@ -13,6 +13,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import org.junit.Ignore; import org.junit.jupiter.api.Test; import io.reactivex.rxjava3.core.Single; From 75f970b4582e1fb4b72bd7ea62ac6653b658fb9e Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 20 Jul 2021 16:26:32 -0700 Subject: [PATCH 3/3] !fixup! `@Ignore` -> `@Disabled` - `@Ignore` is no longer supported w/ jUnit 5 / Juniper --- .../java/com/microsoft/signalr/LongPollingTransportTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java index ac7ba383b45c..fd3bef28c77c 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java @@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import io.reactivex.rxjava3.core.Single; @@ -126,7 +126,7 @@ public void CanSetAndTriggerOnReceive() { assertTrue(onReceivedRan.get()); } - @Ignore("https://github.com/dotnet/aspnetcore/issues/34563") + @Disabled("https://github.com/dotnet/aspnetcore/issues/34563") @Test public void LongPollingTransportOnReceiveGetsCalled() { AtomicInteger requestCount = new AtomicInteger();