Merge pull request #341 from kmike/test-running

Improved tox test running & fixed django tests

.travis.yml

@@ -8,6 +8,7 @@ env:
     - BUILDENV=latest
 install:
     - pip install --use-mirrors -r .travis/requirements-$BUILDENV.txt
+    - pip install .
 script:
     - trial scrapy
 notifications:

.travis/requirements-latest.txt

@@ -3,4 +3,4 @@ lxml
 twisted
 boto
 Pillow
-.
+django

.travis/requirements-lucid.txt

@@ -4,4 +4,3 @@ lxml==2.2.4
 twisted==10.0.0
 boto==1.9b
 Pillow<2.0
-.

.travis/requirements-precise.txt

@@ -4,4 +4,4 @@ lxml==2.3.2
 twisted==11.1.0
 boto==2.2.2
 Pillow<2.0
-.
+django==1.3.1

scrapy/tests/test_djangoitem/settings.py

@@ -4,3 +4,5 @@ DATABASES = {
         'NAME': ':memory:',
     }
 }
+
+SECRET_KEY = 'top-secret'

tox.ini

@@ -4,9 +4,24 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27
+envlist = py26, py27, lucid, precise
 
 [testenv]
+deps =
+    -r{toxinidir}/.travis/requirements-latest.txt
 commands =
-    pip install --use-mirrors -r .travis/requirements-latest.txt
-    trial scrapy
+    {toxinidir}/bin/runtests.sh []
+
+[testenv:lucid]
+basepython = python2.6
+deps =
+    -r{toxinidir}/.travis/requirements-lucid.txt
+
+[testenv:precise]
+basepython = python2.7
+deps =
+    -r{toxinidir}/.travis/requirements-precise.txt
+
+[testenv:windows]
+commands =
+    {toxinidir}/bin/runtests.bat []