Skip RC2 encrypted PKCS12 files on Android for iteration counting#88787
Skip RC2 encrypted PKCS12 files on Android for iteration counting#88787vcsjones merged 2 commits intodotnet:mainfrom
Conversation
…do not support RC2 (Android)
|
Tagging subscribers to this area: @dotnet/area-system-security, @bartonjs, @vcsjones Issue DetailsOne of the test documents we use for iteration counting need to test with RC2, which is not supported on Android. Let's skip it. Contributes to #88747. One accepted we should backport to release/7.0 and release/6.0.
|
|
/azp run runtime-android, runtime-androidemulator |
|
No commit pushedDate could be found for PR 88787 in repo dotnet/runtime |
|
/azp run runtime-android,runtime-androidemulator |
|
No commit pushedDate could be found for PR 88787 in repo dotnet/runtime |
|
/azp run runtime-android, runtime-androidemulator |
|
Azure Pipelines successfully started running 2 pipeline(s). |
carlossanlop
left a comment
carlossanlop
left a comment
There was a problem hiding this comment.
Assuming the same CI runs that failed in the test get executed here with the extra azp runs, and they pass, then LGTM.
|
/azp run runtime-android, runtime-androidemulator |
|
Azure Pipelines successfully started running 2 pipeline(s). |
|
Test failures are unrelated. The tests that were failing are now being skipped. Merging. |
|
/backport to release/7.0-staging |
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/5545249733 |
|
@vcsjones 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: Skip iteration count tests on RC2 PKCS12 documents on platforms that do not support RC2 (Android)
Using index info to reconstruct a base tree...
A src/libraries/System.Security.Cryptography/tests/X509Certificates/PfxIterationCountTests.CustomAppContextDataLimit.cs
A src/libraries/System.Security.Cryptography/tests/X509Certificates/PfxIterationCountTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Security.Cryptography.X509Certificates/tests/PfxIterationCountTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Security.Cryptography.X509Certificates/tests/PfxIterationCountTests.cs
Auto-merging src/libraries/System.Security.Cryptography.X509Certificates/tests/PfxIterationCountTests.CustomAppDomainDataLimit.cs
CONFLICT (content): Merge conflict in src/libraries/System.Security.Cryptography.X509Certificates/tests/PfxIterationCountTests.CustomAppDomainDataLimit.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 Skip iteration count tests on RC2 PKCS12 documents on platforms that do not support RC2 (Android)
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! |
|
@vcsjones 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
4 participants
One of the test documents we use for iteration counting need to test with RC2, which is not supported on Android. Let's skip it.
Contributes to #88747.
One accepted we should backport to release/7.0 and release/6.0.