From eb1cf303d30acfec835e4165603de2cc42efdb34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Wed, 30 Jul 2014 17:30:19 -0300
Subject: [PATCH] use pytest.ini to enable twisted plugin

---
 pytest.ini | 2 ++
 tox.ini    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index f034bf233..b568820c9 100644
--- 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
+
diff --git a/tox.ini b/tox.ini
index 62e2b1262..6ebaac260 100644
--- 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