Change fulldbtests to use py.test
This commit is contained in:
parent
6ba7ed4cd6
commit
a1a4b68306
3 changed files with 79 additions and 15 deletions
|
@ -13,8 +13,8 @@ up_mysql() {
|
|||
}
|
||||
|
||||
down_mysql() {
|
||||
docker kill mysql
|
||||
docker rm -v mysql
|
||||
docker kill mysql || true
|
||||
docker rm -v mysql || true
|
||||
}
|
||||
|
||||
up_postgres() {
|
||||
|
@ -30,8 +30,8 @@ up_postgres() {
|
|||
}
|
||||
|
||||
down_postgres() {
|
||||
docker kill postgres
|
||||
docker rm -v postgres
|
||||
docker kill postgres || true
|
||||
docker rm -v postgres || true
|
||||
}
|
||||
|
||||
run_tests() {
|
||||
|
@ -39,7 +39,7 @@ run_tests() {
|
|||
PYTHONPATH=. TEST_DATABASE_URI=$1 TEST=true alembic upgrade head
|
||||
|
||||
# Run the full test suite.
|
||||
SKIP_DB_SCHEMA=true TEST_DATABASE_URI=$1 TEST=true python -m unittest discover -f
|
||||
PYTHONPATH=. SKIP_DB_SCHEMA=true TEST_DATABASE_URI=$1 TEST=true py.test ${2:-.} --ignore=endpoints/appr/test/
|
||||
}
|
||||
|
||||
CIP=${CONTAINERIP-'127.0.0.1'}
|
||||
|
@ -48,20 +48,22 @@ echo "> Using container IP address $CIP"
|
|||
# NOTE: MySQL is currently broken on setup.
|
||||
# Test (and generate, if requested) via MySQL.
|
||||
echo '> Starting MySQL'
|
||||
down_mysql
|
||||
up_mysql
|
||||
|
||||
echo '> Running Full Test Suite (mysql)'
|
||||
set +e
|
||||
run_tests "mysql+pymysql://root:password@$CIP/genschema"
|
||||
run_tests "mysql+pymysql://root:password@$CIP/genschema" $1
|
||||
set -e
|
||||
down_mysql
|
||||
|
||||
# Test via Postgres.
|
||||
echo '> Starting Postgres'
|
||||
down_postgres
|
||||
up_postgres
|
||||
|
||||
echo '> Running Full Test Suite (postgres)'
|
||||
set +e
|
||||
run_tests "postgresql://postgres@$CIP/genschema"
|
||||
run_tests "postgresql://postgres@$CIP/genschema" $1
|
||||
set -e
|
||||
down_postgres
|
||||
|
|
Reference in a new issue