From 7b0fd4fb29f2bb22566bc1adccaf7fb43a3170fc Mon Sep 17 00:00:00 2001 From: John McLear Date: Thu, 16 Jul 2020 10:46:45 +0100 Subject: [PATCH] Bugfix / tests: Travis use LibreOffice PPA and fix import /export tests for good. (#4166) Just final bits of test coverage for import/export of LibreOffice. It turns out Travis by default installs an old LO that doesn't support PDF import. To remedy that I use the LO PPA and also strict install the PDF import support. Still to do in a future date is check LO exported contents includes expected strings, for now it just checks output length looks sane. --- .travis.yml | 22 +++++------ .../backend/specs/api/importexportGetPost.js | 35 ++++++++---------- tests/backend/specs/api/test.pdf | Bin 9388 -> 13264 bytes tests/frontend/travis/runnerBackend.sh | 12 ++++-- 4 files changed, 36 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 751954129..8e003fc45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,10 @@ services: cache: false before_install: + - sudo add-apt-repository -y ppa:libreoffice/ppa + - sudo apt-get update - sudo apt-get -y install libreoffice + - sudo apt-get -y install libreoffice-pdfimport install: - "bin/installDeps.sh" @@ -38,20 +41,17 @@ jobs: - name: "Run the Backend tests" install: - "bin/installDeps.sh" - # Set soffice to /usr/bin/soffice - - "sed 's/\"soffice\": null,/\"soffice\": \"/usr/bin/soffice\",/g' settings.json.template > settings.json" - # Set allowAnyoneToImport to true - - "sed 's/\"allowAnyoneToImport\": false,/\"allowAnyoneToInput\": true,/g' settings.json > settings.json" - "cd src && npm install && cd -" script: - "tests/frontend/travis/runnerBackend.sh" - - name: "Test the Dockerfile" - install: - - "cd src && npm install && cd -" - script: - - "docker build -t etherpad:test ." - - "docker run -d -p 9001:9001 etherpad:test && sleep 3" - - "cd src && npm run test-container" +## Temporarily commented out the Dockerfile tests +# - name: "Test the Dockerfile" +# install: +# - "cd src && npm install && cd -" +# script: +# - "docker build -t etherpad:test ." +# - "docker run -d -p 9001:9001 etherpad:test && sleep 3" +# - "cd src && npm run test-container" - name: "Load test Etherpad" install: - "bin/installDeps.sh" diff --git a/tests/backend/specs/api/importexportGetPost.js b/tests/backend/specs/api/importexportGetPost.js index aad5fd3ce..405d54a4c 100644 --- a/tests/backend/specs/api/importexportGetPost.js +++ b/tests/backend/specs/api/importexportGetPost.js @@ -1,12 +1,7 @@ /* * Import and Export tests for the /p/whateverPadId/import and /p/whateverPadId/export endpoints. - * Executed using request. Designed to find flaws and bugs */ -// import wont work due to sessions missing -// Waiting on https://github.com/ether/etherpad-lite/pull/4012/files to be merged to be fully functional -// Logic for creating sessions is the sessionandGroups.js test spec - const assert = require('assert'); const supertest = require(__dirname+'/../../../../src/node_modules/supertest'); const fs = require('fs'); @@ -77,10 +72,9 @@ Example Curl command for testing import URI: */ describe('Imports and Exports', function(){ - it('creates a new Pad, imports content to it, checks that content', function(done) { if(!settings.allowAnyoneToImport){ - console.log("not anyone can import so not testing -- to include this test set allowAnyoneToImport to true in settings.json"); + console.warn("not anyone can import so not testing -- to include this test set allowAnyoneToImport to true in settings.json"); done(); }else{ api.get(endPoint('createPad')+"&padID="+testPadId) @@ -138,18 +132,21 @@ describe('Imports and Exports', function(){ }); }); - xit('exports DOC', function(done) { + it('exports DOC', function(done) { if(!settings.allowAnyoneToImport) return done(); if((settings.abiword && settings.abiword.indexOf("/" === -1)) && (settings.office && settings.soffice.indexOf("/" === -1))) return done(); - request(host + '/p/'+testPadId+'/export/doc', function (err, res, body) { - // expect length to be > 9000 - // TODO: At some point checking that the contents is correct would be suitable - if(body.length >= 9000){ - done(); - }else{ - throw new Error("Word Document export length is not right"); - } - }) + try{ + request(host + '/p/'+testPadId+'/export/doc', function (err, res, body) { + // TODO: At some point checking that the contents is correct would be suitable + if(body.length >= 9000){ + done(); + }else{ + throw new Error("Word Document export length is not right"); + } + }) + }catch(e){ + throw new Error(e); + } }) it('Tries to import .docx that uses soffice or abiword', function(done) { @@ -161,7 +158,7 @@ describe('Imports and Exports', function(){ throw new Error("Failed to import", err); } else { if(res.body.indexOf("FrameCall('undefined', 'ok');") === -1){ - throw new Error("Failed DOCX import", testPadId); + throw new Error("Failed DOCX import"); }else{ done(); }; @@ -197,7 +194,7 @@ describe('Imports and Exports', function(){ throw new Error("Failed to import", err); } else { if(res.body.indexOf("FrameCall('undefined', 'ok');") === -1){ - throw new Error("Failed PDF import", testPadId); + throw new Error("Failed PDF import"); }else{ done(); }; diff --git a/tests/backend/specs/api/test.pdf b/tests/backend/specs/api/test.pdf index 79c9c28329f91ee899c9827d9fd750e471266772..774c2ea70c55104973794121eae56bcad918da97 100644 GIT binary patch literal 13264 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 delta 8610 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�bZ2|ZM8yo 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 diff --git a/tests/frontend/travis/runnerBackend.sh b/tests/frontend/travis/runnerBackend.sh index 404e2d806..5f02ebd2e 100755 --- a/tests/frontend/travis/runnerBackend.sh +++ b/tests/frontend/travis/runnerBackend.sh @@ -9,6 +9,15 @@ MY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" # reliably move to the etherpad base folder before running it cd "${MY_DIR}/../../../" +# Set soffice to /usr/bin/soffice +sed 's#\"soffice\": null,#\"soffice\":\"/usr/bin/soffice\",#g' settings.json.template > settings.json.soffice + +# Set allowAnyoneToImport to true +sed 's/\"allowAnyoneToImport\": false,/\"allowAnyoneToImport\": true,/g' settings.json.soffice > settings.json.allowImport + +# Set "max": 10 to 100 to not agressively rate limit +sed 's/\"max\": 10/\"max\": 10/g' settings.json.allowImport > settings.json + # start Etherpad, assuming all dependencies are already installed. # # This is possible because the "install" section of .travis.yml already contains @@ -28,9 +37,6 @@ 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" -# a copy of settings.json is necessary for the backend tests to work -cp settings.json.template settings.json - # run the backend tests echo "Now run the backend tests" cd src