libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

tests: Kill Etherpad and wait for it to exit

Browse source
This commit is contained in:
Richard Hansen 2020-11-20 21:11:21 -05:00 committed by John McLear
parent 9abb77e899
commit c9eb4c72a5
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,6 @@ node remote_runner.js
exit_code=$? exit_code=$?
kill $(cat /tmp/sauce.pid) kill $(cat /tmp/sauce.pid)
kill $ep_pid kill "$ep_pid" && wait "$ep_pid"
exit $exit_code exit $exit_code

3
tests/frontend/travis/runnerBackend.sh
View file

@ -24,6 +24,7 @@ sed 's/\"points\": 10/\"points\": 1000/g' settings.json.rateLimit > settings.jso
# 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 "${@}" &
ep_pid=$!
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"
@ -43,5 +44,5 @@ cd src
failed=0 failed=0
npm run test || failed=1 npm run test || failed=1
kill "$ep_pid" && wait "$ep_pid"
exit $failed exit $failed

3
tests/frontend/travis/runnerLoadTest.sh
View file

@ -21,6 +21,7 @@ sed 's/\"loadTest\": false,/\"loadTest\": true,/g' settings.json.points > settin
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 "${@}" &
ep_pid=$!
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"
@ -45,7 +46,7 @@ echo "Now run the load tests for 25 seconds and if it stalls before 100 then err
etherpad-loadtest -d 25 etherpad-loadtest -d 25
exit_code=$? exit_code=$?
kill $! kill "$ep_pid" && wait "$ep_pid"
sleep 5 sleep 5
exit $exit_code exit $exit_code