Internal google build file change.

Enable EspressoWithPausedTest to run in INSTRUMENTATION_TEST looper mode again inside google. It was previously disabled due to espresso bug. PiperOrigin-RevId: 703634483
android · Dec 9, 2024 · ea275f0 · ea275f0
1 parent f5ff2c3
commit ea275f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/espresso/CHANGELOG.md b/espresso/CHANGELOG.md
@@ -16,6 +16,8 @@ The following artifacts were released:
 
 **Bug Fixes**
 
+* Fix deadlock in espresso in Robolectric INSTRUMENTATION_TEST + paused looper.
+
 **New Features**
 
 **Breaking Changes**

diff --git a/espresso/core/java/androidx/test/espresso/base/ThreadPoolExecutorExtractor.java b/espresso/core/java/androidx/test/espresso/base/ThreadPoolExecutorExtractor.java
@@ -19,6 +19,8 @@
 import android.os.Handler;
 import android.os.Looper;
 import androidx.annotation.Nullable;
+import androidx.test.internal.platform.ServiceLoaderWrapper;
+import androidx.test.internal.platform.os.ControlledLooper;
 import java.lang.reflect.Field;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -42,6 +44,10 @@ final class ThreadPoolExecutorExtractor {
   private static final String MODERN_ASYNC_TASK_FIELD_NAME = "THREAD_POOL_EXECUTOR";
   private final Handler mainHandler;
 
+  private final ControlledLooper controlledLooper =
+      ServiceLoaderWrapper.loadSingleService(
+          ControlledLooper.class, () -> ControlledLooper.NO_OP_CONTROLLED_LOOPER);
+
   @Inject
   ThreadPoolExecutorExtractor(Looper looper) {
     mainHandler = new Handler(looper);
@@ -85,6 +91,7 @@ public void run() {
             }
           });
       try {
+        controlledLooper.drainMainThreadUntilIdle();
         latch.await();
       } catch (InterruptedException ie) {
         if (!futureToRun.isDone()) {