summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-04-27 16:22:26 +0200
committerAdrian Tschira <nota@notafile.com>2018-04-27 16:29:41 +0200
commit4f5694e2cecc8530d09fd00e8bb6f165764a6042 (patch)
tree00a3f95aad78f799a4700ac6fbb3a928be2f79a4
parentMerge pull request #3127 from matrix-org/rav/deferred_timeout (diff)
downloadsynapse-4f5694e2cecc8530d09fd00e8bb6f165764a6042.tar.xz
Add py3 tests to tox with folders that work
It's just a few tests, but it will at least prevent a few files from
regressing. Also, it makes it easiert to check your code against py36
while writing it.

Signed-off-by: Adrian Tschira <nota@notafile.com>
-rw-r--r--tox.ini10
1 files changed, 9 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index f408defc8f..c6cee92568 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = packaging, py27, pep8
+envlist = packaging, py27, py36 pep8
 
 [testenv]
 deps =
@@ -46,6 +46,14 @@ commands =
 # )
 usedevelop=true
 
+[testenv:py36]
+usedevelop=true
+commands =
+    /usr/bin/find "{toxinidir}" -name '*.pyc' -delete
+    coverage run {env:COVERAGE_OPTS:} --source="{toxinidir}/synapse" \
+        "{envbindir}/trial" {env:TRIAL_FLAGS:} {posargs:tests/metrics} {env:TOXSUFFIX:}
+    {env:DUMP_COVERAGE_COMMAND:coverage report -m}
+
 [testenv:packaging]
 deps =
     check-manifest