From 7dae7087d3734ea12d97130fab7515c6f604c581 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 6 Dec 2016 11:35:14 +0000
Subject: [PATCH] Fix unittests under tox

We now need to set PYTHONPATH when running the unit tests; update tox config to
do so.
---
 tox.ini | 7 +++++++
 1 file changed, 7 insertions(+)

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:}"