diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-14 20:56:23 +1000 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-14 20:56:23 +1000 |
commit | 591bf87c6afcdb4e8978a275219dd10dba4efc25 (patch) | |
tree | a2620b679bcaa6ecf75388be0ed5e17fa350d2cd /tox.ini | |
parent | Fixes test_reap_monthly_active_users so it passes under postgres (diff) | |
parent | Implement a new test baseclass to cut down on boilerplate (#3684) (diff) | |
download | synapse-591bf87c6afcdb4e8978a275219dd10dba4efc25.tar.xz |
Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_postgres
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini index ed26644bd9..085f438989 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = packaging, py27, py36, pep8, check_isort -[testenv] +[base] deps = coverage Twisted>=15.1 @@ -15,6 +15,15 @@ deps = setenv = PYTHONDONTWRITEBYTECODE = no_byte_code +[testenv] +deps = + {[base]deps} + +setenv = + {[base]setenv} + +passenv = * + commands = /usr/bin/find "{toxinidir}" -name '*.pyc' -delete coverage run {env:COVERAGE_OPTS:} --source="{toxinidir}/synapse" \ @@ -46,6 +55,15 @@ commands = # ) usedevelop=true +[testenv:py27-postgres] +usedevelop=true +deps = + {[base]deps} + psycopg2 +setenv = + {[base]setenv} + SYNAPSE_POSTGRES = 1 + [testenv:py36] usedevelop=true commands = |