Skip to content

Commit

Permalink
Improved android e2e tests stability
Browse files Browse the repository at this point in the history
Summary:
Some tweaks to make CircleCI pass
Closes facebook#8425

Differential Revision: D3485087

Pulled By: bestander

fbshipit-source-id: b1941ecedbcaf81f0bcb34a10686f21f2ded3114
  • Loading branch information
bestander authored and Facebook Github Bot 4 committed Jun 24, 2016
1 parent 37e41d2 commit c58a7aa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion scripts/circle-ci-android-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ function retry3 {
}
done
}

6 changes: 3 additions & 3 deletions scripts/run-ci-e2e-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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(
() => {
Expand Down Expand Up @@ -202,7 +202,7 @@ try {
}
}
exitCode = 0;

} finally {
cd(ROOT);
rm(MARKER_IOS);
Expand Down

0 comments on commit c58a7aa

Please sign in to comment.