summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-18 17:31:46 +0000
committerErik Johnston <erik@matrix.org>2019-03-18 17:38:22 +0000
commitb6ac5e40a0a3265f3a93bb28663398a1b55bed1e (patch)
tree89302a8f957923a37e9e7345340e4f90afff47b6
parentNewsfile (diff)
downloadsynapse-b6ac5e40a0a3265f3a93bb28663398a1b55bed1e.tar.xz
Add coverage to py27-old
-rw-r--r--tox.ini9
1 files changed, 6 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index 19080a648f..4400041778 100644
--- a/tox.ini
+++ b/tox.ini
@@ -82,15 +82,18 @@ deps =
 
     mock
     lxml
+    coverage
 commands =
     /usr/bin/find "{toxinidir}" -name '*.pyc' -delete
     # Make all greater-thans equals so we test the oldest version of our direct
     # dependencies, but make the pyopenssl 17.0, which can work against an
     # OpenSSL 1.1 compiled cryptography (as older ones don't compile on Travis).
     /bin/sh -c 'python -m synapse.python_dependencies | sed -e "s/>=/==/g" -e "s/psycopg2==2.6//" -e "s/pyopenssl==16.0.0/pyopenssl==17.0.0/" | xargs pip install'
-    # Install Synapse itself. This won't update any libraries.
-    pip install -e .
-    {envbindir}/trial {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:}
+
+    # Add this so that coverage will run on subprocesses
+    /bin/sh -c 'echo "import coverage; coverage.process_startup()" > {envsitepackagesdir}/../sitecustomize.py'
+
+    {envbindir}/coverage run "{envbindir}/trial"  {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:}
 
 [testenv:packaging]
 skip_install=True