From 986be9a3965f4fef071beb0f726e30a700d9e227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Fri, 28 Mar 2014 13:53:53 -0300
Subject: [PATCH] Run testsuite with py.test

---
 .travis.yml            |  1 +
 tests-requirements.txt |  1 +
 tox.ini                | 12 ++++++++----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 367a56280..2f2092a74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ env:
 - TOXENV=precise
 - TOXENV=trunk
 - TOXENV=pypy
+- TOXENV=py33
 matrix:
   allow_failures:
   - env: TOXENV=pypy
diff --git a/tests-requirements.txt b/tests-requirements.txt
index 34275dfa7..b7d6a0a56 100644
--- a/tests-requirements.txt
+++ b/tests-requirements.txt
@@ -1,3 +1,4 @@
 # Tests requirements
 mock
 mitmproxy >= 0.10
+pytest-twisted
diff --git a/tox.ini b/tox.ini
index cebffbccc..597abfb5d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,8 @@
 
 [tox]
 envlist = py27, pypy, precise, trunk, py33
+indexserver =
+    HPK = https://devpi.net/hpk/dev/
 
 [testenv]
 deps =
@@ -15,7 +17,7 @@ deps =
     django
     -rtests-requirements.txt
 commands =
-    trial {posargs:scrapy}
+    py.test --twisted {posargs:scrapy}
 
 [testenv:precise]
 basepython = python2.7
@@ -34,7 +36,7 @@ basepython = python2.7
 commands =
     pip install https://github.com/scrapy/w3lib/archive/master.zip#egg=w3lib
     pip install https://github.com/scrapy/queuelib/archive/master.zip#egg=queuelib
-    trial {posargs:scrapy}
+    py.test --twisted {posargs:scrapy}
 
 [testenv:py33]
 basepython = python3.3
@@ -45,8 +47,10 @@ deps =
     cssselect>=0.9
     queuelib>=1.1.1
     w3lib>=1.5
-commands =
-    trial {posargs:scrapy}
+    # tests requirements
+    mock
+    :HPK:pytest>2.5.2
+    pytest-twisted
 
 [testenv:windows]
 commands =
-- 
GitLab