Skip to content

Commit

Permalink
Updated travis script
Browse files Browse the repository at this point in the history
  • Loading branch information
viklund committed Apr 5, 2018
1 parent 0ea9885 commit 209ba62
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ disable=print-statement,
keyword-arg-before-vararg,
arguments-differ,
line-too-long,
import-error
import-error,
no-self-use

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
8 changes: 4 additions & 4 deletions test/travis_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ mysql -u swefreq -h 127.0.0.1 -P 3366 swefreq_test < test/data/load_dummy_data.s

echo ">>> Test 3. Check that the backend starts"

cd backend
../test/01_daemon_starts.sh
cd ..
(cd backend && ../test/01_daemon_starts.sh)


echo ">>> Test 4. the backend API"
Expand All @@ -43,10 +41,12 @@ BACKEND_PID=$!

sleep 2 # Lets wait a little bit so the server has started

function exit_handler() {
exit_handler() {
rv=$?
# Ignore errors in the exit handler
set +e
# We want to make sure the background process has stopped, otherwise the
# travis test will stall for a long time.
kill -9 $BACKEND_PID

echo "THE HTTP LOG WAS:"
Expand Down

0 comments on commit 209ba62

Please sign in to comment.