Merge pull request brave#7773 from brave/feature/parallel-travis

split Travis into parallel test suites
NejcZdovc · Mar 20, 2017 · d717669 · d717669
2 parents 842ec25 + cd8b3d7
commit d717669
Show file tree

Hide file tree

Showing 26 changed files with 17 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,17 +3,30 @@ node_js:
   - "7"
 dist: trusty
 sudo: required
+cache:
+  directories:
+    - node_modules
 before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
-script:
+before_script:
   - npm run download-sync-client
-  - npm run lint && npm test
+script:
+  - npm run lint
+  - npm run testsuite
 notifications:
   slack:
     secure: bDwO2uce5JAZvjrvWj4+/+yEXJAIK4O0RcgUWvZ2IMbi7Q9I89Mw40JmkLWL6x2gWZwxr8+FoLtErJA7RVrsfImjrX+NmMyAB7AydLdrBJtkLozNnuacnhcnBRyp1gGCa1ymxCEXGbgC6onAD3kiJJhggr70T+2lu3IuJYXENhc=
 env:
-  - CXX=g++-4.8 NODE_ENV=test
+  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=unit
+  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=about
+  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=app
+  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=bookmark-components
+  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=bravery-components
+  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=contents
+  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=misc-components
+  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=navbar-components
+  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=tab-components
 addons:
   apt:
     sources:

diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "start2": "node ./tools/start.js --user-data-dir=brave-development-2 --debug=5859 --enable-logging --v=0 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck",
     "start-brk": "node ./tools/start.js --debug-brk=5858 -enable-logging --v=0 --enable-dcheck",
     "test": "cross-env NODE_ENV=test mocha \"test/**/*Test.js\"",
+    "testsuite": "cross-env NODE_ENV=test mocha \"test/$TEST_DIR/**/*Test.js\"",
     "unittest": "cross-env NODE_ENV=test mocha \"test/unit/**/*Test.js\"",
     "unittest-cov": "node --harmony node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha --report html --report text -x \"test/unit/**/*Test.js\" -- \"test/unit/**/*Test.js\"",
     "uitest": "cross-env NODE_ENV=test mocha \"test/about/**/*Test.js\" \"test/app/**/*Test.js\" \"test/components/**/*Test.js\" \"test/lib/**/*Test.js\"",

diff --git a/...omponents/ledgerPanelAdvancedPanelTest.js → test/about/ledgerPanelAdvancedPanelTest.js b/...omponents/ledgerPanelAdvancedPanelTest.js → test/about/ledgerPanelAdvancedPanelTest.js
diff --git a/test/components/ledgerPanelTest.js → test/about/ledgerPanelTest.js b/test/components/ledgerPanelTest.js → test/about/ledgerPanelTest.js
diff --git a/test/components/bookmarksTest.js → test/bookmark-components/bookmarksTest.js b/test/components/bookmarksTest.js → test/bookmark-components/bookmarksTest.js
diff --git a/test/components/bookmarksToolbarTest.js → ...okmark-components/bookmarksToolbarTest.js b/test/components/bookmarksToolbarTest.js → ...okmark-components/bookmarksToolbarTest.js
diff --git a/test/components/braveryPanelTest.js → test/bravery-components/braveryPanelTest.js b/test/components/braveryPanelTest.js → test/bravery-components/braveryPanelTest.js
diff --git a/.../components/clearBrowsingDataPanelTest.js → ...-components/clearBrowsingDataPanelTest.js b/.../components/clearBrowsingDataPanelTest.js → ...-components/clearBrowsingDataPanelTest.js
diff --git a/test/components/flashTest.js → test/bravery-components/flashTest.js b/test/components/flashTest.js → test/bravery-components/flashTest.js
diff --git a/test/components/noScriptTest.js → test/bravery-components/noScriptTest.js b/test/components/noScriptTest.js → test/bravery-components/noScriptTest.js
diff --git a/test/components/notificationBarTest.js → ...bravery-components/notificationBarTest.js b/test/components/notificationBarTest.js → ...bravery-components/notificationBarTest.js
diff --git a/test/components/autofillTest.js → test/contents/autofillTest.js b/test/components/autofillTest.js → test/contents/autofillTest.js
diff --git a/test/components/contentLoadingTest.js → test/contents/contentLoadingTest.js b/test/components/contentLoadingTest.js → test/contents/contentLoadingTest.js
diff --git a/test/components/errorPageTest.js → test/contents/errorPageTest.js b/test/components/errorPageTest.js → test/contents/errorPageTest.js
diff --git a/test/components/contextMenuTest.js → test/misc-components/contextMenuTest.js b/test/components/contextMenuTest.js → test/misc-components/contextMenuTest.js
diff --git a/test/components/findbarTest.js → test/misc-components/findbarTest.js b/test/components/findbarTest.js → test/misc-components/findbarTest.js
diff --git a/test/components/syncTest.js → test/misc-components/syncTest.js b/test/components/syncTest.js → test/misc-components/syncTest.js
diff --git a/test/components/windowTest.js → test/misc-components/windowTest.js b/test/components/windowTest.js → test/misc-components/windowTest.js
diff --git a/test/components/navigationBarTest.js → test/navbar-components/navigationBarTest.js b/test/components/navigationBarTest.js → test/navbar-components/navigationBarTest.js
diff --git a/test/components/urlBarSuggestionsTest.js → ...avbar-components/urlBarSuggestionsTest.js b/test/components/urlBarSuggestionsTest.js → ...avbar-components/urlBarSuggestionsTest.js
diff --git a/test/components/urlBarTest.js → test/navbar-components/urlBarTest.js b/test/components/urlBarTest.js → test/navbar-components/urlBarTest.js
diff --git a/test/components/frameTest.js → test/tab-components/frameTest.js b/test/components/frameTest.js → test/tab-components/frameTest.js
diff --git a/test/components/pinnedTabTest.js → test/tab-components/pinnedTabTest.js b/test/components/pinnedTabTest.js → test/tab-components/pinnedTabTest.js
diff --git a/test/components/tabPagesTest.js → test/tab-components/tabPagesTest.js b/test/components/tabPagesTest.js → test/tab-components/tabPagesTest.js
diff --git a/test/components/tabTest.js → test/tab-components/tabTest.js b/test/components/tabTest.js → test/tab-components/tabTest.js
diff --git a/test/components/tabsToolbarTest.js → test/tab-components/tabsToolbarTest.js b/test/components/tabsToolbarTest.js → test/tab-components/tabsToolbarTest.js