From c58a7aa546112457d3303f96b6c3747b05bea609 Mon Sep 17 00:00:00 2001
From: Konstantin Raev <bestander@fb.com>
Date: Fri, 24 Jun 2016 16:54:52 -0700
Subject: [PATCH] Improved android e2e tests stability

Summary:
Some tweaks to make CircleCI pass
Closes https://github.com/facebook/react-native/pull/8425

Differential Revision: D3485087

Pulled By: bestander

fbshipit-source-id: b1941ecedbcaf81f0bcb34a10686f21f2ded3114
---
 circle.yml                         | 2 +-
 scripts/circle-ci-android-setup.sh | 1 -
 scripts/run-ci-e2e-tests.js        | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/circle.yml b/circle.yml
index 696b51aaa..ba313223e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -77,7 +77,7 @@ test:
     - ./gradlew :ReactAndroid:assembleDebugAndroidTest -Pjobs=1 -Pcom.android.build.threadPoolSize=1
 
     # Android e2e test
-    - node ./scripts/run-ci-e2e-tests.js --android --js --retries 3
+    - source scripts/circle-ci-android-setup.sh && retry3 node ./scripts/run-ci-e2e-tests.js --android --js --retries 2
 
     # testing docs generation is not broken
     - cd website && node ./server/generate.js
diff --git a/scripts/circle-ci-android-setup.sh b/scripts/circle-ci-android-setup.sh
index 3920cc0c0..9f6174a84 100644
--- a/scripts/circle-ci-android-setup.sh
+++ b/scripts/circle-ci-android-setup.sh
@@ -38,4 +38,3 @@ function retry3 {
     }
   done
 }
-
diff --git a/scripts/run-ci-e2e-tests.js b/scripts/run-ci-e2e-tests.js
index cf3534b64..0fcf2bbd0 100644
--- a/scripts/run-ci-e2e-tests.js
+++ b/scripts/run-ci-e2e-tests.js
@@ -78,7 +78,7 @@ try {
       exec('sleep 10s');
       return exec(`react-native init EndToEndTest --version ${PACKAGE}`).code;
     },
-    numberOfRetries, 
+    numberOfRetries,
     () => rm('-rf', 'EndToEndTest'))) {
       echo('Failed to execute react-native init');
       echo('Most common reason is npm registry connectivity, try again');
@@ -131,7 +131,7 @@ try {
     });
     SERVER_PID = packagerProcess.pid;
     // wait a bit to allow packager to startup
-    exec('sleep 5s');
+    exec('sleep 15s');
     echo('Executing android e2e test');
     if (tryExecNTimes(
       () => {
@@ -202,7 +202,7 @@ try {
     }
   }
   exitCode = 0;
-  
+
 } finally {
   cd(ROOT);
   rm(MARKER_IOS);