public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: re-enable docker tests in travis (#4395) 

Thanks to node10 having better support we can re-enable these tests.
pull/4397/head
John McLear 2020-10-06 14:21:09 +01:00 committed by GitHub
parent 52f8fc9ba3
commit 92d4b8b649
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.travis.yml
View File

@ -47,14 +47,13 @@ jobs:
- "cd src && npm install && cd -" - "cd src && npm install && cd -"
script: script:
- "tests/frontend/travis/runnerBackend.sh" - "tests/frontend/travis/runnerBackend.sh"
## Temporarily commented out the Dockerfile tests - name: "Test the Dockerfile"
# - name: "Test the Dockerfile" install:
# install: - "cd src && npm install && cd -"
# - "cd src && npm install && cd -" script:
# script: - "docker build -t etherpad:test ."
# - "docker build -t etherpad:test ." - "docker run -d -p 9001:9001 etherpad:test && sleep 3"
# - "docker run -d -p 9001:9001 etherpad:test && sleep 3" - "cd src && npm run test-container"
# - "cd src && npm run test-container"
- name: "Load test Etherpad without Plugins" - name: "Load test Etherpad without Plugins"
install: install:
- "bin/installDeps.sh" - "bin/installDeps.sh"
@ -83,14 +82,13 @@ jobs:
- "cd src && npm install && cd -" - "cd src && npm install && cd -"
script: script:
- "tests/frontend/travis/runnerBackend.sh" - "tests/frontend/travis/runnerBackend.sh"
## Temporarily commented out the Dockerfile tests - name: "Test the Dockerfile"
# - name: "Test the Dockerfile" install:
# install: - "cd src && npm install && cd -"
# - "cd src && npm install && cd -" script:
# script: - "docker build -t etherpad:test ."
# - "docker build -t etherpad:test ." - "docker run -d -p 9001:9001 etherpad:test && sleep 3"
# - "docker run -d -p 9001:9001 etherpad:test && sleep 3" - "cd src && npm run test-container"
# - "cd src && npm run test-container"
- name: "Load test Etherpad with Plugins" - name: "Load test Etherpad with Plugins"
install: install:
- "bin/installDeps.sh" - "bin/installDeps.sh"

2
tests/frontend/travis/runner.sh
View File

@ -16,7 +16,7 @@ cd "${MY_DIR}/../../../"
# This is possible because the "install" section of .travis.yml already contains # This is possible because the "install" section of .travis.yml already contains
# a call to bin/installDeps.sh # a call to bin/installDeps.sh
echo "Running Etherpad directly, assuming bin/installDeps.sh has already been run" echo "Running Etherpad directly, assuming bin/installDeps.sh has already been run"
node node_modules/ep_etherpad-lite/node/server.js "${@}" & node node_modules/ep_etherpad-lite/node/server.js --experimental-worker "${@}" &
echo "Now I will try for 15 seconds to connect to Etherpad on http://localhost:9001" echo "Now I will try for 15 seconds to connect to Etherpad on http://localhost:9001"