Skip to content

Commit

Permalink
Fix iOS e2e test (#23566)
Browse files Browse the repository at this point in the history
Summary:
As part of #23561 this is an attempt at fixing iOS.

[iOS] [Fixed] - e2e test
Pull Request resolved: #23566

Differential Revision: D14162780

Pulled By: cpojer

fbshipit-source-id: b55d32e30f88370100f7fbddf9dfb208280844f4
  • Loading branch information
ericlewis authored and facebook-github-bot committed Feb 21, 2019
1 parent c06473a commit 4a01be4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
8 changes: 5 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,10 @@ aliases:
name: iOS Test Suite
command: ./scripts/objc-test-ios.sh test

- &run-objc-ios-e2e-tests
name: iOS End-to-End Test Suite
command: node ./scripts/run-ci-e2e-tests.js --ios --retries 3;

- &display-broken-tests-warning
name: Running broken tests (Ignore any failures past this point)
command: |
Expand All @@ -255,9 +259,6 @@ aliases:
- &run-e2e-tests
name: End-to-End Test Suite
command: ./scripts/run-ci-e2e-tests.js --android --ios --js --retries 3;
- &run-objc-ios-e2e-tests
name: iOS End-to-End Test Suite
command: node ./scripts/run-ci-e2e-tests.js --ios --retries 3;
- &run-android-e2e-tests
name: Android End-to-End Test Suite
command: node ./scripts/run-ci-e2e-tests.js --android --retries 3;
Expand Down Expand Up @@ -367,6 +368,7 @@ jobs:
- restore-cache: *restore-cache-homebrew
- run: *brew-install-watchman
- save-cache: *save-cache-homebrew
- run: *run-objc-ios-e2e-tests
- run: *run-objc-ios-tests

- store_test_results:
Expand Down
12 changes: 2 additions & 10 deletions scripts/run-ci-e2e-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,7 @@ let exitCode;

try {
// install CLI
cd('react-native-cli');
exec('yarn pack');
const CLI_PACKAGE = path.join(
ROOT,
'react-native-cli',
'react-native-cli-*.tgz',
);
cd('..');

const CLI_PACKAGE = 'react-native-cli';
if (!argv['skip-cli-install']) {
if (exec(`sudo yarn global add ${CLI_PACKAGE}`).code) {
echo('Could not install react-native-cli globally.');
Expand Down Expand Up @@ -197,7 +189,7 @@ try {
if (
tryExecNTimes(() => {
exec('sleep 10s');
let destination = 'platform=iOS Simulator,name=iPhone 5s,OS=11.4';
let destination = 'platform=iOS Simulator,name=iPhone 5s,OS=12.1';
let sdk = 'iphonesimulator';
let scheme = 'EndToEndTest';

Expand Down

0 comments on commit 4a01be4

Please sign in to comment.