diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-17 14:37:13 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-17 14:37:13 +0000 |
commit | 0186aef81421111ead4577debafcada211ddd0c3 (patch) | |
tree | 2c8bfa0a7d9276b54ed2503926240015dfa47ea1 /tox.ini | |
parent | Bump version and change log (diff) | |
parent | Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver (diff) | |
download | synapse-0186aef81421111ead4577debafcada211ddd0c3.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini index 01b23e6bd9..95424765c3 100644 --- a/tox.ini +++ b/tox.ini @@ -6,11 +6,13 @@ deps = coverage Twisted>=15.1 mock + python-subunit + junitxml setenv = PYTHONDONTWRITEBYTECODE = no_byte_code commands = - coverage run --source=synapse {envbindir}/trial {posargs:tests} - coverage report -m + /bin/bash -c "coverage run --source=synapse {envbindir}/trial {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:}" + {env:DUMP_COVERAGE_COMMAND:coverage report -m} [testenv:packaging] deps = @@ -23,4 +25,4 @@ skip_install = True basepython = python2.7 deps = flake8 -commands = flake8 synapse +commands = /bin/bash -c "flake8 synapse {env:PEP8SUFFIX:}" |