Adding -x to nosetests and correcting DB setup scripts
This commit is contained in:
parent
97db37e9f2
commit
b444f7d3b1
|
@ -31,22 +31,8 @@ apt-get install -y gstreamer1.0-plugins-base \
|
|||
postgresql-client
|
||||
|
||||
# Creating database for testing
|
||||
setupAirtimePostgresUser() {
|
||||
# here-doc to execute this block as postgres user
|
||||
su postgres <<'EOF'
|
||||
set +e
|
||||
count=$(psql -d postgres -tAc "SELECT count(*) FROM pg_roles WHERE rolname='airtime';")
|
||||
if [[ $count -eq 0 ]]; then
|
||||
psql -d postgres -tAc "CREATE USER airtime WITH ENCRYPTED PASSWORD 'airtime'; ALTER USER airtime CREATEDB; CREATE DATABASE libretime; GRANT CONNECT ON DATABASE libretime TO libretime;"
|
||||
[[ $? -eq 0 ]] &&
|
||||
echo "Created airtime user in PostgreSQL" ||
|
||||
echo "$0:${FUNCNAME}(): ERROR: Can't create airtime user in PostgreSQL!"
|
||||
else
|
||||
echo "airtime user already exists in PostgreSQL"
|
||||
fi
|
||||
set -e
|
||||
# don't indent this!
|
||||
EOF
|
||||
}
|
||||
|
||||
setupAirtimePostgresUser
|
||||
-u postgres psql -c 'CREATE DATABASE libretime;'
|
||||
-u postgres psql -c "CREATE USER libretime WITH PASSWORD 'libretime';"
|
||||
-u postgres psql -c 'GRANT CONNECT ON DATABASE libretime TO libretime;'
|
||||
-u postgres psql -c 'ALTER USER libretime CREATEDB;'
|
||||
mkdir -p /tmp/log/libretime
|
|
@ -3,10 +3,10 @@
|
|||
# Starting at repo root
|
||||
|
||||
cd python_apps/airtime_analyzer
|
||||
nosetests .
|
||||
nosetests . -x
|
||||
|
||||
cd ../api_clients
|
||||
nosetests .
|
||||
nosetests . -x
|
||||
|
||||
# Reset to repo root
|
||||
cd ../..
|
Loading…
Reference in New Issue