summary refs log tree commit diff
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2019-01-17 15:55:37 +0200
committerJason Robinson <jasonr@matrix.org>2019-01-23 10:32:41 +0200
commit899e60be80736e3b747eb567171296829e96f716 (patch)
treee643177af6d259fd1f475e80588cd7f05da36ac1
parentFix a test docstring in frontend proxy tests (diff)
downloadsynapse-899e60be80736e3b747eb567171296829e96f716.tar.xz
Add parameterized Python module to test dependencies
Allows running parameterized tests. BSD license.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
-rw-r--r--synapse/python_dependencies.py2
-rw-r--r--tox.ini1
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 882e844eb1..b5555fbba9 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -81,7 +81,7 @@ CONDITIONAL_REQUIREMENTS = {
 
     "saml2": ["pysaml2>=4.5.0"],
     "url_preview": ["lxml>=3.5.0"],
-    "test": ["mock>=2.0"],
+    "test": ["mock>=2.0", "parameterized"],
 }
 
 
diff --git a/tox.ini b/tox.ini
index a0f5486829..9b6cb2036c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,7 @@ deps =
     python-subunit
     junitxml
     coverage
+    parameterized
 
     # cyptography 2.2 requires setuptools >= 18.5
     #