From d8e067a5f953b17b551e4da03f3ad1e0604b7f95 Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 29 May 2020 12:28:31 +0100 Subject: [PATCH] tests: Resolve Gateway timeout during automated tests by adding delay after minify request * Remove npm cache from Travis, this was causing a world of pain. * Remove the broken line attribute tests. * Do a HTTP get against Etherpad to begin minification. * Wait 10 seconds after minification before running tests. --- .travis.yml | 5 +- tests/frontend/travis/remote_runner.js | 85 +++++++++++++------------- tests/frontend/travis/runnerBackend.sh | 7 ++- 3 files changed, 51 insertions(+), 46 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b3bb6c7c..d790a8c36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,12 @@ node_js: services: - docker +cache: + npm: false + install: - "bin/installDeps.sh" - "export GIT_HASH=$(git rev-parse --verify --short HEAD)" - - "npm install ep_test_line_attrib" before_script: - "tests/frontend/travis/sauce_tunnel.sh" @@ -33,7 +35,6 @@ jobs: install: - "bin/installDeps.sh" - "export GIT_HASH=$(git rev-parse --verify --short HEAD)" - - "npm install ep_test_line_attrib" script: - "tests/frontend/travis/runner.sh" - name: "Test the Dockerfile" diff --git a/tests/frontend/travis/remote_runner.js b/tests/frontend/travis/remote_runner.js index 09c892f66..7fc990c70 100644 --- a/tests/frontend/travis/remote_runner.js +++ b/tests/frontend/travis/remote_runner.js @@ -18,53 +18,58 @@ var sauceTestWorker = async.queue(function (testSettings, callback) { testSettings["public"] = true; testSettings["build"] = process.env.GIT_HASH; - browser.init(testSettings).get("http://localhost:9001/tests/frontend/", function(){ - var url = "https://saucelabs.com/jobs/" + browser.sessionID; - console.log("Remote sauce test '" + name + "' started! " + url); + // we wait 10 seconds here with the hope it was enough time for the minified files to be built etc. + setTimeout(function(){ + browser.init(testSettings).get("http://localhost:9001/tests/frontend/", function(){ + var url = "https://saucelabs.com/jobs/" + browser.sessionID; + console.log("Remote sauce test '" + name + "' started! " + url); - //tear down the test excecution - var stopSauce = function(success){ - getStatusInterval && clearInterval(getStatusInterval); - clearTimeout(timeout); + //tear down the test excecution + var stopSauce = function(success){ + getStatusInterval && clearInterval(getStatusInterval); + clearTimeout(timeout); - browser.quit(); + browser.quit(); - if(!success){ - allTestsPassed = false; + if(!success){ + allTestsPassed = false; + } + + var testResult = knownConsoleText.replace(/\[red\]/g,'\x1B[31m').replace(/\[yellow\]/g,'\x1B[33m') + .replace(/\[green\]/g,'\x1B[32m').replace(/\[clear\]/g, '\x1B[39m'); + testResult = testResult.split("\\n").map(function(line){ + return "[" + testSettings.browserName + (testSettings.version === "" ? '' : (" " + testSettings.version)) + "] " + line; + }).join("\n"); + + console.log(testResult); + console.log("Remote sauce test '" + name + "' finished! " + url); + + callback(); } - var testResult = knownConsoleText.replace(/\[red\]/g,'\x1B[31m').replace(/\[yellow\]/g,'\x1B[33m') - .replace(/\[green\]/g,'\x1B[32m').replace(/\[clear\]/g, '\x1B[39m'); - testResult = testResult.split("\\n").map(function(line){ - return "[" + testSettings.browserName + (testSettings.version === "" ? '' : (" " + testSettings.version)) + "] " + line; - }).join("\n"); + //timeout for the case the test hangs + var timeout = setTimeout(function(){ + stopSauce(false); + }, 60000 * 10); - console.log(testResult); - console.log("Remote sauce test '" + name + "' finished! " + url); + var knownConsoleText = ""; + var getStatusInterval = setInterval(function(){ + browser.eval("$('#console').text()", function(err, consoleText){ + if(!consoleText || err){ + return; + } + knownConsoleText = consoleText; - callback(); - } + if(knownConsoleText.indexOf("FINISHED") > 0){ + var success = knownConsoleText.indexOf("FAILED") === -1; + stopSauce(success); + } + }); + }, 5000); + }); - //timeout for the case the test hangs - var timeout = setTimeout(function(){ - stopSauce(false); - }, 60000 * 10); + }, 10000); - var knownConsoleText = ""; - var getStatusInterval = setInterval(function(){ - browser.eval("$('#console').text()", function(err, consoleText){ - if(!consoleText || err){ - return; - } - knownConsoleText = consoleText; - - if(knownConsoleText.indexOf("FINISHED") > 0){ - var success = knownConsoleText.indexOf("FAILED") === -1; - stopSauce(success); - } - }); - }, 5000); - }); }, 5); //run 5 tests in parrallel // 1) Firefox on Linux @@ -73,28 +78,24 @@ sauceTestWorker.push({ , 'browserName' : 'firefox' , 'version' : 'latest' }); - // 2) Chrome on Linux sauceTestWorker.push({ 'platform' : 'Linux' , 'browserName' : 'googlechrome' , 'version' : 'latest' }); - // 3) Safari on OSX 10.15 sauceTestWorker.push({ 'platform' : 'OS X 10.15' , 'browserName' : 'safari' , 'version' : 'latest' }); - // 4) IE 10 on Win 8 sauceTestWorker.push({ 'platform' : 'Windows 8' , 'browserName' : 'iexplore' , 'version' : '10.0' }); - // 5) Edge on Win 10 sauceTestWorker.push({ 'platform' : 'Windows 10' diff --git a/tests/frontend/travis/runnerBackend.sh b/tests/frontend/travis/runnerBackend.sh index 50e5ce36b..b63e11b32 100755 --- a/tests/frontend/travis/runnerBackend.sh +++ b/tests/frontend/travis/runnerBackend.sh @@ -28,8 +28,11 @@ echo "Now I will try for 15 seconds to connect to Etherpad on http://localhost:9 echo "Successfully connected to Etherpad on http://localhost:9001" -# just in case, let's wait for another second before going on -sleep 1 +# Build the minified files? +curl http://localhost:9001/p/minifyme -f -s + +# just in case, let's wait for another 10 seconds before going on +sleep 10 # a copy of settings.json is necessary for the backend tests to work cp settings.json.template settings.json