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]) {