Skip to content

Commit 30873d4

Browse files
committed
use same calling format as other scripts
1 parent 6c563da commit 30873d4

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

docker/run_unit_tests.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
#!/usr/bin/env bash
1+
#!/bin/bash -e
2+
SCRIPTDIR=$(python -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
3+
4+
# Make sure we're in the correct place relative to Dockerfile no matter where we were called from
5+
cd `dirname "$SCRIPTDIR"`
26

37
docker build -t asylum_test .
48
docker run --rm --name asylum_test -it asylum_test ./run_tests.sh

project/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env sh
1+
#!/usr/bin/env bash
22
sudo pip install -r requirements/test.txt
33
sudo -u postgres service postgresql start
44
export PGPASSWORD=asylum; while true; do psql -q asylum -c 'SELECT 1;' 1>/dev/null 2>&1 ; if [ "$?" -ne "0" ]; then echo "Waiting for psql"; sleep 1; else break; fi; done

0 commit comments

Comments
 (0)