Restore smoketest for offline-ready SW page

lighthouse-cli/scripts/run-smoke-tests.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
-cd lighthouse-cli/test/fixtures && python -m SimpleHTTPServer 10200 &
-cd lighthouse-cli/test/fixtures && python -m SimpleHTTPServer 10404 &
+node lighthouse-cli/test/fixtures/static-server.js &
+
+sleep 0.5s
 
 NODE=$([ $(node -v | grep -E "v4") ] && echo "node --harmony" || echo "node")
 config="$PWD/lighthouse-cli/test/fixtures/smoketest-offline-config.json"
@@ -30,10 +31,10 @@ if ! grep -q "$offline200result: false" results; then
   exit 1
 fi
 
-sleep 1s
+sleep 0.5s
 
 # run minimal lighthouse run against a basic offline-sw page
-$NODE lighthouse-cli --config-path=$config --quiet http://localhost:10404/offline-ready.html > results
+$NODE lighthouse-cli --config-path=$config --quiet http://localhost:10503/offline-ready.html > results
 
 if ! grep -q "$offline200result: true" results; then
   echo "Fail! offline ready site did not work while offline"

lighthouse-cli/test/fixtures/offline-ready-sw.js

@@ -26,30 +26,22 @@ const PRECACHE_URLS = [
   './smoketest-offline-config.json'
 ];
 
-function pLog() {
-  return function(obj) {
-    console.log('' + Date.now() + 'I just received' + JSON.stringify(obj));
-    return obj;
-  };
-}
 // Names of the two caches used in this version of the service worker.
 // Change to v2, etc. when you update any of the local resources, which will
 // in turn trigger the install event again.
 const PRECACHE = 'precache-v1';
 const RUNTIME = 'runtime';
 
-
-
 // The install handler takes care of precaching the resources we always need.
 self.addEventListener('install', event => {
-  var populateCaches = caches.open(PRECACHE).then(pLog())
-      .then(cache => cache.addAll(PRECACHE_URLS)).then(pLog());
+  self.skipWaiting();
+
+  const populateCaches = caches.open(PRECACHE)
+      .then(cache => cache.addAll(PRECACHE_URLS));
 
   event.waitUntil(populateCaches);
-  event.waitUntil(self.skipWaiting());
 });
 
-
 // The activate handler takes care of cleaning up old caches.
 self.addEventListener('activate', event => {
   const currentCaches = [PRECACHE, RUNTIME];

lighthouse-cli/test/fixtures/offline-ready.html

@@ -47,3 +47,13 @@ <h4>
     });
   }
 </script>
+
+<script>
+  // Lighthouse will move on to the next thing at onload, however this will race with
+  // the cache population in the serviceworker's install phase.
+  // We use an image that takes 2-seconds to load to delay window onload.
+  //   (Also about that document.write.. Bless me Souders for I have sinned...)
+  document.write(`
+    <img src="http://1.cuzillion.com/bin/resource.cgi?type=gif&sleep=2&n=1&t=${Date.now()}">
+    `);
+</script>

lighthouse-cli/test/fixtures/static-server.js

@@ -0,0 +1,48 @@
+
+const http = require('http');
+const path = require('path');
+const fs = require('fs');
+const parseURL = require('url').parse;
+
+function requestHandler(request, response) {
+  const filePath = parseURL(request.url).pathname;
+  const absoluteFilePath = path.join(__dirname, filePath);
+
+  fs.exists(absoluteFilePath, fsExistsCallback);
+
+  function fsExistsCallback(fileExists) {
+    if (!fileExists) {
+      if (!filePath.endsWith('favicon.ico')) {
+        console.error(`Cannot find file ${absoluteFilePath}`);
+      }
+      return sendResponse(404, '404 - File not found');
+    }
+    fs.readFile(absoluteFilePath, 'binary', readFileCallback);
+  }
+
+  function readFileCallback(err, file) {
+    if (err) {
+      console.error(`Unable to read local file ${absoluteFilePath}:`, err);
+      return sendResponse(500, '500 - Internal Server Error');
+    }
+    sendResponse(200, file);
+  }
+
+  function sendResponse(statusCode, data) {
+    const headers = filePath.endsWith('.js') ?
+        {'Content-Type': 'text/javascript'} : undefined;
+    response.writeHead(statusCode, headers);
+    response.write(data, 'binary');
+    response.end();
+  }
+}
+
+const serverForOnline = http.createServer(requestHandler);
+const serverForOffline = http.createServer(requestHandler);
+
+serverForOnline.on('error', e => console.error(e.code, e));
+serverForOffline.on('error', e => console.error(e.code, e));
+
+// Listen
+serverForOnline.listen(10200);
+serverForOffline.listen(10503);

lighthouse-core/scripts/run-mocha.sh

@@ -3,7 +3,7 @@
 flag=$1
 
 function _runmocha() {
-  mocha $2 $__node_harmony $(find $1/test -name '*.js') --timeout 60000;
+  mocha $2 $__node_harmony $(find $1/test -name '*.js' -not -path '*/fixtures/*') --timeout 60000;
 }
 
 if [ "$flag" == '--watch' ]; then