Fix Iran time zone test case #83952
Fix Iran time zone test case #83952
Conversation
Co-authored-by: Stephen Toub <stoub@microsoft.com>
|
Test failures related to the change: |
|
/backport to release/7.0-staging |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/4547945741 |
|
@tarekgh backporting to release/7.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix Iran time zone test case
Using index info to reconstruct a base tree...
M src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix Iran time zone test case
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@tarekgh an error occurred while backporting to release/7.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
/backport to release/6.0-staging |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/4547981968 |
|
@tarekgh 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 Iran time zone test case
Using index info to reconstruct a base tree...
M src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix Iran time zone test case
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@tarekgh 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. |
|
/backport to release/7.0-staging |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/4548209582 |
|
@carlossanlop backporting to release/7.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix Iran time zone test case
Using index info to reconstruct a base tree...
M src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Runtime/tests/System/TimeZoneInfoTests.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix Iran time zone test case
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@carlossanlop an error occurred while backporting to release/7.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
ghost
locked as resolved and limited conversation to collaborators
Fixes #83901
In the recent ICU updates, there has been some changing in the Iran time zone display name which broke our test. The fix here is allow both the old and new names to ensure the test succeed in all platforms.