aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkotibold2011-03-20 01:34:24 +0100
committermarkotibold2011-03-20 01:34:24 +0100
commitd168f42b134508cec44627ee7f423f1ab8c1d1a5 (patch)
tree19b53fc3e322828b2d18cd13c0e6b32384b187cc
parentbc9a0a9a0f6af89dcbdc83182976386dd78e8771 (diff)
downloaddjango-rest-framework-d168f42b134508cec44627ee7f423f1ab8c1d1a5.tar.bz2
testing jenkins
-rw-r--r--examples/runtests.py2
-rw-r--r--tox.ini14
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/runtests.py b/examples/runtests.py
index fd79bc64..e291e312 100644
--- a/examples/runtests.py
+++ b/examples/runtests.py
@@ -1,6 +1,6 @@
import os
import sys
-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'examples.settings'
from django.conf import settings
from django.test.utils import get_runner
diff --git a/tox.ini b/tox.ini
index caeab328..9004ad36 100644
--- a/tox.ini
+++ b/tox.ini
@@ -85,16 +85,16 @@ deps=
[testenv:py26-django12-examples]
basepython=python2.6
-#commands=
-# python examples/runtests.py
+commands=
+ python examples/runtests.py
deps=
django==1.2.4
coverage==3.4
- #wsgiref==0.1.2
- #Pygments==1.4
- #httplib2==0.6.0
- #Markdown==2.0.3
- #https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
+ wsgiref==0.1.2
+ Pygments==1.4
+ httplib2==0.6.0
+ Markdown==2.0.3
+ https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip
[testenv:py27-django12-examples]
basepython=python2.7