From 4c2d9589560b009dc6aaa89e55cce52c7d04473d Mon Sep 17 00:00:00 2001 From: Sarp Misoglu Date: Wed, 8 Nov 2023 17:12:01 +0000 Subject: Fix broken test by increasing Thread#join timeout The timeout was added in ag/19606284 but it seems 1ms wasn't enough for the work to complete so the test as almost 100% flaky. Test: atest UserBackupManagerServiceTest Fixes: 276437270 Fixes: 309507814 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bf8a676082dc24a3397c412c9b8b8e68da8f18d1) Merged-In: Ie8ff85d8fc52ae9e9d80778131afc0bf8a8eedd6 Change-Id: Ie8ff85d8fc52ae9e9d80778131afc0bf8a8eedd6 NOTE FOR REVIEWERS - errors occurred while applying the patch. PLEASE REVIEW CAREFULLY. Errors: Error applying patch in services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java, hunk HunkHeader[84,7->84,7]: Hunk cannot be applied Original patch: From bf8a676082dc24a3397c412c9b8b8e68da8f18d1 Mon Sep 17 00:00:00 2001 From: Sarp Misoglu Date: Wed, 05 Apr 2023 14:25:06 +0100 Subject: [PATCH] Fix broken test by increasing Thread#join timeout The timeout was added in ag/19606284 but it seems 1ms wasn't enough for the work to complete so the test as almost 100% flaky. Test: atest UserBackupManagerServiceTest Fixes: 276437270 Change-Id: Ie8ff85d8fc52ae9e9d80778131afc0bf8a8eedd6 --- --- .../src/com/android/server/backup/UserBackupManagerServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java index dc1c6d57dfdb..74d664fe7977 100644 --- a/services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/backup/UserBackupManagerServiceTest.java @@ -75,7 +75,7 @@ public class UserBackupManagerServiceTest { private static final String TEST_PACKAGE = "package1"; private static final String[] TEST_PACKAGES = new String[] { TEST_PACKAGE }; private static final String TEST_TRANSPORT = "transport"; - private static final int WORKER_THREAD_TIMEOUT_MILLISECONDS = 1; + private static final int WORKER_THREAD_TIMEOUT_MILLISECONDS = 100; @Mock Context mContext; @Mock IBackupManagerMonitor mBackupManagerMonitor; -- cgit v1.2.3-59-g8ed1b