test: attempt to fix travis issues

electron-userland · Jul 28, 2016 · c0468cd · c0468cd
1 parent d605e23
commit c0468cd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,13 @@ osx_image: xcode7.3
 matrix:
   include:
     - os: osx
-      env: TEST_FILES=macPackagerTest,BuildTest,linuxPackagerTest,globTest NODE_VERSION=6
+      env: TEST_FILES=BuildTest,linuxPackagerTest,globTest NODE_VERSION=6 PUBLISH_TO_NPM=true
 
     - os: osx
-      env: TEST_FILES=macPackagerTest,CodeSignTest,winPackagerTest NODE_VERSION=4
+      env: TEST_FILES=macPackagerTest,winPackagerTest NODE_VERSION=6
+
+    - os: osx
+      env: TEST_FILES=macPackagerTest,CodeSignTest NODE_VERSION=4
 
 language: c
 
@@ -35,7 +38,7 @@ script:
 - npm run test
 
 after_success:
-- if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" && "$AUTO_PUBLISH" != "false" && "$TRAVIS_TAG" == "" && "$NODE_VERSION" == "6" ]]; then npm run semantic-release ; fi
+- if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" && "$AUTO_PUBLISH" != "false" && "$TRAVIS_TAG" == "" && "$PUBLISH_TO_NPM" == "true" ]]; then npm run semantic-release ; fi
 
 branches:
   except:

diff --git a/test/src/helpers/runTests.ts b/test/src/helpers/runTests.ts
@@ -125,6 +125,10 @@ function runTests(): BluebirdPromise<any> {
   const args: Array<string> = []
   const testFiles = process.env.TEST_FILES
 
+  if (process.env.TRAVIS) {
+    args.push("--concurrency=2")
+  }
+
   const baseDir = path.join("test", "out")
   const baseForLinuxTests = [path.join(baseDir, "ArtifactPublisherTest.js"), path.join(baseDir, "httpRequestTest.js"), path.join(baseDir, "RepoSlugTest.js")]
   let skipWin = false