More concise unit test running (#1650)

* mocha report in dot format * silence the CLI tests from logging out.
GoogleChrome · Feb 7, 2017 · 5403bc3 · 5403bc3
1 parent 08611ab
commit 5403bc3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/lighthouse-cli/test/cli/chrome-launcher-test.js b/lighthouse-cli/test/cli/chrome-launcher-test.js
@@ -19,15 +19,18 @@
 require('../../compiled-check.js')('chrome-launcher.js');
 
 const ChromeLauncher = require('../../chrome-launcher.js').ChromeLauncher;
+const log = require('../../../lighthouse-core/lib/log');
 const assert = require('assert');
 
 /* eslint-env mocha */
 
 describe('ChromeLauncher', () => {
   it('doesn\'t fail when killed twice', () => {
+    log.setLevel('error');
     const chromeInstance = new ChromeLauncher();
     return chromeInstance.run()
       .then(() => {
+        log.setLevel();
         return Promise.all([
           chromeInstance.kill(),
           chromeInstance.kill()
@@ -36,6 +39,7 @@ describe('ChromeLauncher', () => {
   });
 
   it('doesn\'t launch multiple chrome processes', () => {
+    log.setLevel('error');
     const chromeInstance = new ChromeLauncher();
     let pid;
     return chromeInstance.run()
@@ -44,6 +48,7 @@ describe('ChromeLauncher', () => {
         return chromeInstance.run();
       })
       .then(() => {
+        log.setLevel();
         assert.strictEqual(pid, chromeInstance.chrome.pid);
         return chromeInstance.kill();
       });

diff --git a/lighthouse-cli/test/cli/index-test.js b/lighthouse-cli/test/cli/index-test.js
@@ -22,7 +22,7 @@ const childProcess = require('child_process');
 
 describe('CLI Tests', function() {
   it('fails if a url is not provided', () => {
-    assert.throws(() => childProcess.execSync('node lighthouse-cli/index.js'),
+    assert.throws(() => childProcess.execSync('node lighthouse-cli/index.js', {stdio: 'pipe'}),
           /Please provide a url/);
   });
 

diff --git a/lighthouse-core/formatters/partials/speedline.html b/lighthouse-core/formatters/partials/speedline.html
@@ -1,9 +1,3 @@
-<style>
-  .speedline-measures {
-    font-size: 14px
-  }
-</style>
-
 <ul class="subitem__details">
   <li class="subitem__detail">First Visual Change: <strong>{{this.timings.firstVisualChange}}ms</strong></li>
   <li class="subitem__detail">Last Visual Change: <strong>{{this.timings.visuallyComplete}}ms</strong></li>

diff --git a/lighthouse-core/lib/log.js b/lighthouse-core/lib/log.js
@@ -87,13 +87,13 @@ class Log {
   static setLevel(level) {
     switch (level) {
       case 'silent':
-        debug.disable();
+        debug.enable('-*');
         break;
       case 'verbose':
         debug.enable('*');
         break;
       case 'error':
-        debug.enable('*:error');
+        debug.enable('-*, *:error');
         break;
       default:
         debug.enable('*, -*:verbose');

diff --git a/lighthouse-core/scripts/run-mocha.sh b/lighthouse-core/scripts/run-mocha.sh
@@ -3,7 +3,7 @@
 flag=$1
 
 function _runmocha() {
-  mocha $2 $(find $1/test -name '*-test.js') --timeout 60000;
+  mocha --reporter dot $2 $(find $1/test -name '*-test.js') --timeout 60000;
 }
 
 if [ "$flag" == '--watch' ]; then
@@ -15,5 +15,7 @@ elif [ "$flag" == '--viewer' ]; then
 elif [ "$flag" == '--core' ]; then
     _runmocha 'lighthouse-core'
 else
-    _runmocha 'lighthouse-cli' && _runmocha 'lighthouse-core' && _runmocha 'lighthouse-viewer'
+    echo "lighthouse-core tests" && _runmocha 'lighthouse-core' && \
+    echo "lighthouse-cli tests" && _runmocha 'lighthouse-cli' && \
+    echo "lighthouse-viewer tests" && _runmocha 'lighthouse-viewer'
 fi