Browse Source

increase android e2e timeout to 10sec, test-all works as expected now

Daniel Zlotin 7 years ago
parent
commit
1a91dcf056

+ 1
- 1
AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/BaseTest.java View File

@@ -23,7 +23,7 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
23 23
 @RunWith(AndroidJUnit4.class)
24 24
 public abstract class BaseTest {
25 25
 	public static final String PACKAGE_NAME = "com.reactnativenavigation.playground";
26
-	public static final long TIMEOUT = 3000;
26
+	public static final long TIMEOUT = 10000;
27 27
 
28 28
 	@Before
29 29
 	public void beforeEach() throws Exception {

+ 7
- 4
scripts/test.all.js View File

@@ -1,11 +1,14 @@
1
-
1
+/* eslint no-console:0 */
2 2
 const exec = require('shell-utils').exec;
3 3
 
4 4
 async function run() {
5 5
   exec.execSync(`yarn run clean`);
6
-  exec.execSync(`yarn run test-js & yarn run test-unit-android -- release & yarn run test-unit-ios -- release`);
7
-  await Promise.all([exec.execAsync(`yarn run test-e2e-android -- release`), exec.execAsync(`yarn run test-e2e-ios -- release`)]);
8
-  console.log('DONE!!!'); //eslint-disable-line
6
+  exec.execSync(`yarn run test-js`);
7
+  exec.execAsyncSilent(`yarn run start`);
8
+  await exec.execAsyncAll(`yarn run test-unit-android`, `yarn run test-unit-ios`);
9
+  await exec.execAsyncAll(`yarn run test-e2e-android`, `yarn run test-e2e-ios`);
10
+  exec.execSync(`yarn run clean`);
11
+  console.log('ALL PASSED!!!');
9 12
 }
10 13
 
11 14
 run();

+ 2
- 2
yarn.lock View File

@@ -4137,8 +4137,8 @@ shell-quote@1.6.1, shell-quote@^1.6.1:
4137 4137
     jsonify "~0.0.0"
4138 4138
 
4139 4139
 shell-utils@1.x.x:
4140
-  version "1.0.6"
4141
-  resolved "https://registry.yarnpkg.com/shell-utils/-/shell-utils-1.0.6.tgz#38155673bb78a33c51f8d8400e383d316467b109"
4140
+  version "1.0.7"
4141
+  resolved "https://registry.yarnpkg.com/shell-utils/-/shell-utils-1.0.7.tgz#0286eeb6ff6db6c31b05c35b930b6cf531fa8ce2"
4142 4142
   dependencies:
4143 4143
     lodash "4.x.x"
4144 4144