Fix flaky tests.

- Mark FirebaseJobServiceTest#testOnStopJob_ResetsWorkStatus() as a @LargeTest.
- Give WorkTimer#testStopTimer_withCleanUp() a bit more time.

Test: Existing tests pass.
Change-Id: If29fb1fa762858b27584c17ed8509501dda0ff62

2 files changed, 3 insertions, 2 deletions

diff --git a/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobServiceTest.java b/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobServiceTest.java
index 8e168102871..502704b8388 100644
--- a/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobServiceTest.java
+++ b/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobServiceTest.java
@@ -22,6 +22,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import android.support.test.filters.LargeTest;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
@@ -64,7 +65,7 @@ public class FirebaseJobServiceTest {
     }
 
     @Test
-    @SmallTest
+    @LargeTest
     public void testOnStopJob_ResetsWorkStatus() throws InterruptedException {
         OneTimeWorkRequest work =
                 new OneTimeWorkRequest.Builder(FirebaseInfiniteTestWorker.class).build();
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/WorkTimerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/WorkTimerTest.java
index ce36b8ccd00..1fd4498041b 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/WorkTimerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/WorkTimerTest.java
@@ -62,7 +62,7 @@ public class WorkTimerTest {
         TestTimeLimitExceededListener listenerSpy = spy(mListener);
         mWorkTimer.startTimer(WORKSPEC_ID_1, 100, listenerSpy);
         mWorkTimer.stopTimer(WORKSPEC_ID_1);
-        Thread.sleep(100);
+        Thread.sleep(200);
         verify(listenerSpy, times(0)).onTimeLimitExceeded(WORKSPEC_ID_1);
         assertThat(mWorkTimer.getTimerMap().size(), is(0));
         assertThat(mWorkTimer.getListeners().size(), is(0));