diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java index 9be060b99..5e703104e 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java @@ -52,7 +52,8 @@ import static org.mockito.Mockito.mock; */ public abstract class ReactIntegrationTestCase extends AndroidTestCase { - private static final long IDLE_TIMEOUT_MS = 15000; + // we need a bigger timeout for CI builds because they run on a slow emulator + private static final long IDLE_TIMEOUT_MS = 60000; private @Nullable CatalystInstance mInstance; private @Nullable ReactBridgeIdleSignaler mBridgeIdleSignaler; diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java index 46f636d25..8a65a51f6 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactTestHelper.java @@ -13,7 +13,6 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.concurrent.Callable; import android.app.Instrumentation; import android.content.Context; @@ -144,25 +143,14 @@ public class ReactTestHelper { @Override public CatalystInstance build() { final CatalystInstance instance = builder.build(); - try { - instance.getReactQueueConfiguration().getJSQueueThread().callOnQueue( - new Callable() { - @Override - public Void call() throws Exception { - testCase.initializeWithInstance(instance); - instance.runJSBundle(); - return null; - } - }).get(); - InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() { - @Override - public void run() { - instance.initialize(); - } - }); - } catch (Exception e) { - throw new RuntimeException(e); - } + testCase.initializeWithInstance(instance); + instance.runJSBundle(); + InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() { + @Override + public void run() { + instance.initialize(); + } + }); testCase.waitForBridgeAndUIIdle(); return instance; }