summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2020-05-01 12:56:06 -0300
committerBruno Oliveira <nicoddemus@gmail.com>2020-05-01 15:10:28 -0300
commitfd2f172258d120912b6cb5fb2b9e7eab714b6098 (patch)
tree8219eafee952b73ea2a376bad440d32c3f4cc64d /tox.ini
parentbe68496440508b760ba1f988bcc63d1d09ace206 (diff)
downloadpytest-fd2f172258d120912b6cb5fb2b9e7eab714b6098.tar.gz
Let unittest frameworks deal with async functions
Instead of trying to handle unittest-async functions in pytest_pyfunc_call, let the unittest framework handle them instead. This lets us remove the hack in pytest_pyfunc_call, with the upside that we should support any unittest-async based framework. Also included 'asynctest' as test dependency for py37-twisted, and renamed 'twisted' to 'unittestextras' to better reflect that we install 'twisted' and 'asynctest' now. This also fixes the problem of cleanUp functions not being properly called for async functions. Fix #7110 Fix #6924
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini5
1 files changed, 3 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 3a280abb7..8f23e3cf9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ envlist =
py37
py38
pypy3
- py37-{pexpect,xdist,twisted,numpy,pluggymaster}
+ py37-{pexpect,xdist,unittestextras,numpy,pluggymaster}
doctesting
py37-freeze
docs
@@ -49,7 +49,8 @@ deps =
pexpect: pexpect
pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
pygments
- twisted: twisted
+ unittestextras: twisted
+ unittestextras: asynctest
xdist: pytest-xdist>=1.13
{env:_PYTEST_TOX_EXTRA_DEP:}