Fix nit, hopefully fix chrome start

estherkim · Feb 14, 2019 · b9ba432 · b9ba432
1 parent 3cb87fa
commit b9ba432
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -66,6 +66,7 @@ jobs:
       before_install:
         - export CHROME_BIN=google-chrome-stable
         - export DISPLAY=:99.0
+        - sh -e /etc/init.d/xvfb start
         # Explicitly add yarn and gsutil install because this section overrides before_install parent section
         - curl -o- -L https://yarnpkg.com/install.sh | bash
         - export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
@@ -90,6 +91,7 @@ jobs:
       before_install: 
         - export CHROME_BIN=google-chrome-stable
         - export DISPLAY=:99.0
+        - sh -e /etc/init.d/xvfb start
         # Explicitly add yarn and gsutil install because this section overrides before_install parent section
         - curl -o- -L https://yarnpkg.com/install.sh | bash
         - export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"

diff --git a/build-system/pr-check/dist-test.js b/build-system/pr-check/dist-test.js
@@ -45,13 +45,13 @@ function main() {
     runSinglePassTest_();
   }
   else {
-    let runTests = false;
+    let ranTests = false;
 
     if (buildTargets.has('RUNTIME')) {
       unzipBuildOutput(); //TODO(estherkim): does this belong here?
       timedExecOrDie('gulp dist --fortesting --noextensions');
       timedExecOrDie('gulp bundle-size --on_pr_build');
-      runTests = true;
+      ranTests = true;
     } else {
       timedExecOrDie('gulp bundle-size --on_skipped_build');
     }
@@ -60,10 +60,10 @@ function main() {
     buildTargets.has('BUILD_SYSTEM') ||
     buildTargets.has('INTEGRATION_TEST')) {
       runSinglePassTest_();
-      runTests = true;
+      ranTests = true;
     }
 
-    if (!runTests) {
+    if (!ranTests) {
       console.log('Skipping dist tests because this commit does ' +
       'not affect the runtime, build system, or integration test files.');
     }

diff --git a/build-system/pr-check/local-test.js b/build-system/pr-check/local-test.js
@@ -39,36 +39,36 @@ function main() {
     //timedExecOrDie('gulp e2e --nobuild');
   }
   else {
-    let runTests = false;
+    let ranTests = false;
 
     if (buildTargets.has('RUNTIME') ||
     buildTargets.has('BUILD_SYSTEM') ||
     buildTargets.has('UNIT_TEST')) {
       timedExecOrDie('gulp test --nobuild --headless --local-changes');
-      runTests = true;
+      ranTests = true;
     }
 
     if (buildTargets.has('RUNTIME') ||
     buildTargets.has('BUILD_SYSTEM') ||
     buildTargets.has('INTEGRATION_TEST')) {
       timedExecOrDie('gulp test --integraton --nobuild --headless --coverage');
-      runTests = true;
+      ranTests = true;
     }
 
     if (buildTargets.has('RUNTIME') ||
     buildTargets.has('BUILD_SYSTEM')) {
       timedExecOrDie('gulp test --unit --nobuild --headless --coverage');
       //TODO(estherkim): turn on when stabilized :)
       //timedExecOrDie('gulp e2e --nobuild');
-      runTests = true;
+      ranTests = true;
     }
 
     if (buildTargets.has('DEV_DASHBOARD')) {
       timedExecOrDie('gulp test --dev_dashboard --nobuild');
-      runTests = true;
+      ranTests = true;
     }
 
-    if (!runTests) {
+    if (!ranTests) {
       console.log('Skipping unit and integration tests because ' +
       'this commit not affect the runtime, build system, ' +
       'unit test files, integration test files, or the dev dashboard.');

diff --git a/build-system/pr-check/remote-test.js b/build-system/pr-check/remote-test.js
@@ -43,22 +43,22 @@ function main() {
     timedExecOrDie('gulp test --integration --nobuild --compiled --saucelabs');
   }
   else {
-    let runTests = false;
+    let ranTests = false;
 
     if (buildTargets.has('RUNTIME') ||
     buildTargets.has('BUILD_SYSTEM')) {
       timedExecOrDie('gulp test --unit --nobuild --saucelabs_lite');
-      runTests = true;
+      ranTests = true;
     }
 
     if (buildTargets.has('RUNTIME') ||
     buildTargets.has('BUILD_SYSTEM') ||
     buildTargets.has('INTEGRATION_TEST')) {
       timedExecOrDie('gulp test --integration --nobuild --saucelabs');
-      runTests = true;
+      ranTests = true;
     }
 
-    if (!runTests) {
+    if (!ranTests) {
       console.log('Skipping Sauce Labs unit and integration tests because ' +
       'this commit not affect the runtime, build system, ' +
       'or integration test files.');