diff options
| author | Mark White <anothermark@google.com> | 2024-05-13 13:09:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-13 13:09:22 +0000 |
| commit | 0ddba183343790a324f636f5c6efaee8846f2911 (patch) | |
| tree | 547519d7b746e3f61d54eefa56cfa2e368a0c901 | |
| parent | 2ab30a5c8b41510a603738074d3954de6485daf5 (diff) | |
| parent | 7c34b4540f89438eaaf4c7408ad6420f14926b3e (diff) | |
| download | cts-0ddba183343790a324f636f5c6efaee8846f2911.tar.gz | |
Merge "Increase test timeouts for MT6762 SOC" into android14-tests-dev
| -rw-r--r-- | tests/signature/api-check/hidden-api-killswitch-debug-class/AndroidTest.xml | 2 | ||||
| -rw-r--r-- | tests/signature/api-check/src/java/android/signature/cts/api/BaseKillswitchTest.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/signature/api-check/hidden-api-killswitch-debug-class/AndroidTest.xml b/tests/signature/api-check/hidden-api-killswitch-debug-class/AndroidTest.xml index bbbd3910616..0f465e79fde 100644 --- a/tests/signature/api-check/hidden-api-killswitch-debug-class/AndroidTest.xml +++ b/tests/signature/api-check/hidden-api-killswitch-debug-class/AndroidTest.xml @@ -29,7 +29,7 @@ <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> <option name="class" value="android.signature.cts.api.DebugClassKillswitchTest" /> <option name="runtime-hint" value="60s" /> - <option name="shell-timeout" value="45m" /> + <option name="shell-timeout" value="65m" /> </test> <!-- Controller that will skip the module if a native bridge situation is detected --> diff --git a/tests/signature/api-check/src/java/android/signature/cts/api/BaseKillswitchTest.java b/tests/signature/api-check/src/java/android/signature/cts/api/BaseKillswitchTest.java index ee3903fdaa8..b3c26b37551 100644 --- a/tests/signature/api-check/src/java/android/signature/cts/api/BaseKillswitchTest.java +++ b/tests/signature/api-check/src/java/android/signature/cts/api/BaseKillswitchTest.java @@ -44,22 +44,22 @@ public abstract class BaseKillswitchTest extends AbstractApiTest { private final static Predicate<DexMember> FIELD_FILTER = dexMember -> (dexMember instanceof DexField); - @Test(timeout = 2400000) + @Test(timeout = 3600000) public void testKillswitchMechanismMethodsThroughReflection() { doTestKillswitchMechanism(METHOD_FILTER, /* reflection= */ true, /* jni= */ false); } - @Test(timeout = 2400000) + @Test(timeout = 3600000) public void testKillswitchMechanismMethodsThroughJni() { doTestKillswitchMechanism(METHOD_FILTER, /* reflection= */ false, /* jni= */ true); } - @Test(timeout = 2400000) + @Test(timeout = 3600000) public void testKillswitchMechanismFieldsThroughReflection() { doTestKillswitchMechanism(FIELD_FILTER, /* reflection= */ true, /* jni= */ false); } - @Test(timeout = 2400000) + @Test(timeout = 3600000) public void testKillswitchMechanismFieldsThroughJni() { doTestKillswitchMechanism(FIELD_FILTER, /* reflection= */ false, /* jni= */ true); } |