From ef6f865469b0bf8c02454860637b79950d822516 Mon Sep 17 00:00:00 2001 From: ManickaP Date: Tue, 31 Aug 2021 17:38:14 +0200 Subject: [PATCH] Disable offending H/3 op causing server errors --- eng/pipelines/libraries/stress/http.yml | 2 +- .../tests/StressTests/HttpStress/ClientOperations.cs | 6 ------ .../tests/StressTests/HttpStress/StressClient.cs | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index ba3a9f875f9e9..44809d727a988 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -49,7 +49,7 @@ jobs: - bash: | cd '$(httpStressProject)' - export HTTPSTRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 3.0" + export HTTPSTRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 3.0 -xops 10" export HTTPSTRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 3.0" docker-compose up --abort-on-container-exit --no-color displayName: Run HttpStress - HTTP 3.0 diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/ClientOperations.cs b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/ClientOperations.cs index f856652adb71f..0f8a249a7665d 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/ClientOperations.cs +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/ClientOperations.cs @@ -508,12 +508,6 @@ public static (string name, Func operation)[] Operations = private static void ValidateStatusCode(HttpResponseMessage m, HttpStatusCode expectedStatus = HttpStatusCode.OK) { - // [ActiveIssue("https://github.com/dotnet/runtime/issues/55261")] - if (m.StatusCode == HttpStatusCode.InternalServerError) - { - throw new Exception("IGNORE"); - } - if (m.StatusCode != expectedStatus) { throw new Exception($"Expected status code {expectedStatus}, got {m.StatusCode}"); diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/StressClient.cs b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/StressClient.cs index be0dd1c42b063..fe0a13360fd41 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/StressClient.cs +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/StressClient.cs @@ -209,11 +209,6 @@ async Task RunWorker(int taskNum) { _aggregator.RecordCancellation(opIndex, stopwatch.Elapsed); } - catch (Exception e) when (e.Message == "IGNORE") - { - // [ActiveIssue("https://github.com/dotnet/runtime/issues/55261")] - // See ClientOperations.ValidateStatusCode - } catch (Exception e) { _aggregator.RecordFailure(e, opIndex, stopwatch.Elapsed, requestContext.IsCancellationRequested, taskNum: taskNum, iteration: i);