use pytest.ini to enable twisted plugin

2014-07-30 17:30:19 -03:00 · 2014-07-30 17:30:19 -03:00 · eb1cf303d3
parent caab9f29f2
commit eb1cf303d3
2 changed files with 4 additions and 2 deletions
--- a/pytest.ini
+++ b/pytest.ini
@ -3,3 +3,5 @@
 usefixtures = chdir setlog
 python_files=test_*.py __init__.py
 addopts = --doctest-modules --assert=plain
+twisted = 1
+
--- a/tox.ini
+++ b/tox.ini
@ -16,7 +16,7 @@ deps =
    leveldb
    -rtests/requirements.txt
 commands =
-    py.test --twisted {posargs:scrapy tests}
+    py.test {posargs:scrapy tests}

 [testenv:precise]
 basepython = python2.7
@ -35,7 +35,7 @@ basepython = python2.7
 commands =
    pip install -U https://github.com/scrapy/w3lib/archive/master.zip#egg=w3lib
    pip install -U https://github.com/scrapy/queuelib/archive/master.zip#egg=queuelib
-    py.test --twisted {posargs:scrapy tests}
+    py.test {posargs:scrapy tests}

 [testenv:py33]
 basepython = python3.3