From 75f942dfa807fe6d7b67d0ebca733e018fd66e02 Mon Sep 17 00:00:00 2001 From: Richard Uhler Date: Thu, 11 Jul 2019 09:32:43 +0100 Subject: [PATCH] Disable testEnableRollbackTimeoutFailsRollback test. The test is flaky because it is testing a race condition. The flakiness is fixed with the help of some new @TestApi in I01f3e769711ffa51fa714ff4bc81e70887f427ad. Disable the test on those branches without the fix merged. Bug: 134373106 Bug: 136605788 Test: atest RollbackTest Change-Id: I05edfc142c14631b259ae7aaf2dd31af00363a35 Merged-In: I01f3e769711ffa51fa714ff4bc81e70887f427ad --- .../src/com/android/tests/rollback/RollbackTest.java | 1 + 1 file changed, 1 insertion(+) 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..1b002cadb07fc 100644 --- a/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java +++ b/tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/RollbackTest.java @@ -960,6 +960,7 @@ public class RollbackTest { } @Test + @Ignore("b/136605788") public void testEnableRollbackTimeoutFailsRollback() throws Exception { try { RollbackTestUtils.adoptShellPermissionIdentity(