Skip to content

Update DiagnosticPortTests With Delay#9171

Merged
wiktork merged 1 commit into
dotnet:mainfrom
kkeirstead:kkeirstead/updateDiagnosticPortTestDelay
Apr 2, 2026
Merged

Update DiagnosticPortTests With Delay#9171
wiktork merged 1 commit into
dotnet:mainfrom
kkeirstead:kkeirstead/updateDiagnosticPortTestDelay

Conversation

@kkeirstead

Copy link
Copy Markdown
Member

@kkeirstead kkeirstead requested a review from a team as a code owner April 1, 2026 22:11
@wiktork wiktork merged commit 2005657 into dotnet:main Apr 2, 2026
21 checks passed
@wiktork

wiktork commented Apr 2, 2026

Copy link
Copy Markdown
Member

/backport to release/9.0

@github-actions

github-actions Bot commented Apr 2, 2026

Copy link
Copy Markdown
Contributor

Started backporting to release/9.0 (link to workflow run)

@github-actions

github-actions Bot commented Apr 2, 2026

Copy link
Copy Markdown
Contributor

@wiktork backporting to release/9.0 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Making diagnostic port tests more resilient (copy from net8x)
Using index info to reconstruct a base tree...
M	src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DiagnosticPortTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DiagnosticPortTests.cs
CONFLICT (content): Merge conflict in src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DiagnosticPortTests.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 set advice.mergeConflict false"
Patch failed at 0001 Making diagnostic port tests more resilient (copy from net8x)
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants