From 81207ffebd47eb24912a1a3628445114b5c74f15 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 1 Jun 2018 14:19:14 +0200
Subject: [PATCH 1/2] Run eslint in travis

Makes sure we get early feedback for lint violations.
---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index effb6934..60a40bf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,11 +19,17 @@ addons:
   jwt:
     secure: "d3ekMYslpn6R4f0ajtRMt9SUFmNGDiItHpqaXC5T4KI0KMEsxgvEOfJot5PiFFJWg1DSpJZH6oaW2UxGZ3duJLZrXIEd/JePY8a6NtT35BNgiDPgcp+eu2Bu3rhrSNg7/HEsD1ma+JeUTnv18Ai5oMFfCCQJx2J6osIxyl/ZVxA="
 stages:
+- lint
 - test
 - name: deploy
   if: tag is PRESENT
 jobs:
   include:
+  - stage: lint
+    env:
+    addons:
+    before_script:
+    script: npm run lint
   - stage: deploy
     script: skip
     before_script: skip

From 127b63b79f6a419585f3cc12714df2bc9d8cca4e Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 1 Jun 2018 14:31:58 +0200
Subject: [PATCH 2/2] Stop combining test platforms

Sauce is very unstable, so spread things out so we can more easily
throttle things to more sane levels.
---
 .travis.yml   | 12 +++++++++---
 karma.conf.js |  3 ---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 60a40bf6..0d3f4194 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,15 @@ node_js:
  - 6
 env:
   matrix:
-  - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11'
-  - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11'
-  - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 10,Windows 7'
+  - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 10'
+# FIXME Skip tests in Linux since Sauce Labs browser versions are ancient.
+#  - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Linux'
+  - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='OS X 10.11'
+  - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10'
+#  - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Linux'
+  - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='OS X 10.11'
+  - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 10'
+  - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 7'
   - TEST_BROWSER_NAME=microsoftedge TEST_BROWSER_OS='Windows 10'
   - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.11'
 before_script: npm install -g karma-cli
diff --git a/karma.conf.js b/karma.conf.js
index 79266781..9727c4c0 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -20,9 +20,6 @@ module.exports = function(config) {
 
     for (let i = 0; i < names.length; i++) {
       for (let j = 0; j < platforms.length; j++) {
-        // FIXME Skip tests in Linux since Sauce Labs browser versions are ancient.
-        // https://github.com/novnc/noVNC/pull/1013#issuecomment-382749805
-        if (platforms[j] === 'Linux') continue;
         for (let k = 0; k < versions.length; k++) {
           let launcher_name = 'sl_' + platforms[j].replace(/[^a-zA-Z0-9]/g, '') + '_' + names[i];
           if (versions[k]) {