[release/8.0-staging] Fix WinHttp StreamingTest backward compat version #104837
Conversation
dotnet-issue-labeler
bot
added
the
needs-area-label
|
/backport to release/6.0-staging |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/9914603625 |
liveans
added
area-System.Net.Http
and removed
needs-area-label
|
Tagging subscribers to this area: @dotnet/ncl |
|
@liveans backporting to release/6.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix WinHttp StreamingTest backward compat version
Using index info to reconstruct a base tree...
M src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Windows.cs
M src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/BidirectionStreamingTest.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/BidirectionStreamingTest.cs
Auto-merging src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Windows.cs
CONFLICT (content): Merge conflict in src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Windows.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix WinHttp StreamingTest backward compat version
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@liveans an error occurred while backporting to release/6.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
/azp run runtime-libraries-coreclr outerloop-windows |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
This change is failing on |
I will keep this on hold, until we figure out what's going on with failures in release branches. |
ManickaP
added
Servicing-consider
liveans
force-pushed
the
fix_winhttp_streamingtest_backward_compat_version
branch
from
5ad8650 to
3ec784e
Compare
src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/BidirectionStreamingTest.cs
Outdated
Show resolved
Hide resolved
…ests/BidirectionStreamingTest.cs Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
liveans
added
Servicing-approved
|
Test only change, CI seems happy (windows passes), tell mode, adding servicing-approved |
Disables BidirectionStreamingTests for WS2022
main PR #104722 which fixes the behavior, but in release branches we're disabling tests instead.
Description
Recently, WS2022 got an update which backports AUTOMATIC_CHUNKING in WinHttp, and it affects our test in CI. Because, we were relying on it, now we're disabling tests because #104891 started to pop up with the backport in WS2022.
Customer Impact
No Customer Impact, test-only change.
Regression
No
Testing
CI
Risk
Test-only change, no risk.
Package authoring signed off?
IMPORTANT: If this change touches code that ships in a NuGet package, please make certain that you have added any necessary package authoring and gotten it explicitly reviewed.