commit 81d7a2807fce7d569f685065b6291a7c6e354f03
author Sameer Jain <sameerj@google.com> Thu Jul 06 09:45:08 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 06 09:45:08 2023 +0000
tree 78552072f76353e3dd5469e69ff8bc4725079959
parent f6f2850d8b265678ed62349408d11eaa160929eb
parent 3f343a3e675aca48260f37200aaa8450e9e62ecf

Merge "De-flake scheduler tests." into udc-mainline-prod

tests/unittests/src/com/android/server/healthconnect/HealthConnectThreadSchedulerTest.java

diff --git a/tests/unittests/src/com/android/server/healthconnect/HealthConnectThreadSchedulerTest.java b/tests/unittests/src/com/android/server/healthconnect/HealthConnectThreadSchedulerTest.java
index fca5767..afcb889 100644
--- a/tests/unittests/src/com/android/server/healthconnect/HealthConnectThreadSchedulerTest.java
+++ b/tests/unittests/src/com/android/server/healthconnect/HealthConnectThreadSchedulerTest.java
@@ -57,6 +57,8 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        HealthConnectThreadScheduler.resetThreadPools();
+
         mInternalTaskScheduler = HealthConnectThreadScheduler.sInternalBackgroundExecutor;
         mInternalTaskSchedulerCompletedJobs = mInternalTaskScheduler.getCompletedTaskCount();
         mControllerTaskScheduler = HealthConnectThreadScheduler.sControllerExecutor;
@@ -130,8 +132,6 @@
 
     @Test
     public void testHealthConnectSchedulerClear() {
-        HealthConnectThreadScheduler.resetThreadPools();
-        setUp();
         Truth.assertThat(mInternalTaskSchedulerCompletedJobs).isEqualTo(0);
         Truth.assertThat(mControllerTaskSchedulerCompletedJobs).isEqualTo(0);
         Truth.assertThat(mForegroundTaskSchedulerCompletedJobs).isEqualTo(0);

tests/unittests/src/com/android/server/healthconnect/storage/TestUtils.java

diff --git a/tests/unittests/src/com/android/server/healthconnect/storage/TestUtils.java b/tests/unittests/src/com/android/server/healthconnect/storage/TestUtils.java
index cee8798..21e86f2 100644
--- a/tests/unittests/src/com/android/server/healthconnect/storage/TestUtils.java
+++ b/tests/unittests/src/com/android/server/healthconnect/storage/TestUtils.java
@@ -30,7 +30,7 @@
             } catch (Exception e) {
                 // ignore
             } finally {
-                if (ChronoUnit.SECONDS.between(Instant.now(), startTime) > 1) {
+                if (ChronoUnit.SECONDS.between(startTime, Instant.now()) > 3) {
                     throw new TimeoutException();
                 }
             }