diff --git a/.travis.yml b/.travis.yml index 650818664..23d7c60bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ jobs: install: - "bin/installDeps.sh" - "cd src && npm install && cd -" - - "npm install --prefix ./etherpad-load-test etherpad-load-test" + - "npm install -g etherpad-load-test" script: - "tests/frontend/travis/runnerLoadTest.sh" diff --git a/tests/frontend/travis/runnerLoadTest.sh b/tests/frontend/travis/runnerLoadTest.sh index 82d988f3e..127234f5f 100755 --- a/tests/frontend/travis/runnerLoadTest.sh +++ b/tests/frontend/travis/runnerLoadTest.sh @@ -38,12 +38,8 @@ curl http://localhost:9001/p/minifyme -f -s > /dev/null sleep 10 # run the backend tests -echo "Now run the backend tests" -cd etherpad-load-test -npm install -node app.js -d 60 -# cd src -# npm run test +echo "Now run the load tests for 60 seconds and if it stalls before 100 then error" +etherpad-load-test -d 60 exit_code=$? kill $!