From efc38fd24e4ad41d324061f04ea651c09f3dc7d9 Mon Sep 17 00:00:00 2001 From: Richard Uhler Date: Thu, 6 Jun 2019 14:01:41 +0100 Subject: [PATCH] Reduce ENABLE_ROLLBACK timeout to 0 for timeout test. testEnableRollbackTimeoutFailsRollback works by setting the enable rollback timeout to 1 millisecond so that we will always time out, but the test is failing some times because apparently we enable rollback within the 1 millisecond limit. Reduce the timeout to 0 milliseconds to try and reduce test flakiness. Before lowering the timeout, the test failure was easy to reproduce locally. After lowering the timeout I have not once been able to reproduce the test failure locally. Bug: 134373106 Test: atest RollbackTest:com.android.tests.rollback.RollbackTest#testEnableRollbackTimeoutFailsRollback Change-Id: Ia25561831616dd2f2644743a399b49e35d5d4ea4 --- .../src/com/android/tests/rollback/RollbackTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java index beff0c6bc3088..eac173e43ecf4 100644 --- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java +++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java @@ -35,7 +35,6 @@ import android.content.pm.VersionedPackage; import android.content.rollback.RollbackInfo; import android.content.rollback.RollbackManager; import android.provider.DeviceConfig; -import android.provider.Settings; import android.util.Log; import androidx.test.InstrumentationRegistry; @@ -972,7 +971,7 @@ public class RollbackTest { //setting the timeout to a very short amount that will definitely be triggered DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK, PROPERTY_ENABLE_ROLLBACK_TIMEOUT_MILLIS, - Long.toString(1), false /* makeDefault*/); + Long.toString(0), false /* makeDefault*/); RollbackManager rm = RollbackTestUtils.getRollbackManager(); RollbackTestUtils.uninstall(TEST_APP_A);