Merge pull request #462 from meejah/fix-pytest-twisted

tell travis + tox about pytest.twisted in a different way

integration/conftest.py

@@ -22,8 +22,6 @@ from util import _create_node
 from util import _run_node
 
 
-pytest_plugins = 'pytest_twisted'
-
 # pytest customization hooks
 
 def pytest_addoption(parser):

tox.ini

@@ -3,6 +3,9 @@
 # test suite on all supported python versions. To use it, "pip install tox"
 # and then run "tox" from this directory.
 
+[pytest]
+twisted = 1
+
 [tox]
 envlist = py27
 minversion = 1.7