summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Richard Uhler <ruhler@google.com> 2019-08-30 02:07:58 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-30 02:07:58 -0700
commit873f78d98eb8c9fc0513295b19d17c153911fdda (patch)
tree94b0f02b8e3e9c7df272f4d903ab77ef3c800f8d
parentba04e349ae986e3570644761386f94720281a47e (diff)
parent8e8a2d0cb3ba2d3b8fa24917b3e2236e825b4ff4 (diff)
Merge "Disable flaky testBadApkOnly test." into qt-r1-dev
am: 8e8a2d0cb3 Change-Id: I9489b80cf35638ea7879256cfce6c51df69504a1
-rw-r--r--tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java b/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java
index bad294794337..4315514cb7a5 100644
--- a/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java
+++ b/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java
@@ -25,6 +25,7 @@ import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -63,6 +64,7 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
* Tests watchdog triggered staged rollbacks involving only apks.
*/
@Test
+ @Ignore("b/139175593 flaky test")
public void testBadApkOnly() throws Exception {
runPhase("testBadApkOnlyEnableRollback");
getDevice().reboot();