summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-12-06 11:45:55 +0000
committerGitHub <noreply@github.com>2016-12-06 11:45:55 +0000
commit5a2c33c12eb8a368173dc246a9e78d6732c31760 (patch)
tree2d12f9f67f56f7af9ce49a45ecf9f6130fafcf7e /tox.ini
parentMerge pull request #653 from matrix-org/erikj/preset_guest_join (diff)
parentFix unittests under tox (diff)
downloadsynapse-5a2c33c12eb8a368173dc246a9e78d6732c31760.tar.xz
Merge pull request #1673 from matrix-org/rav/fix_tox_tests
Fix unittests under tox
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini7
1 files changed, 7 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 52d93c65e5..39ad305360 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,8 +8,15 @@ deps =
     mock
     python-subunit
     junitxml
+
+    # needed by some of the tests
+    lxml
+
 setenv =
     PYTHONDONTWRITEBYTECODE = no_byte_code
+    # As of twisted 16.4, trial tries to import the tests as a package, which
+    # means it needs to be on the pythonpath.
+    PYTHONPATH = {toxinidir}
 commands =
     /bin/sh -c "find {toxinidir} -name '*.pyc' -delete ; coverage run {env:COVERAGE_OPTS:} --source={toxinidir}/synapse \
         {envbindir}/trial {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:}"