From e3b08c7f7412ceb1ee1c63fa6f189617e26a4bd4 Mon Sep 17 00:00:00 2001 From: markotibold Date: Sun, 20 Mar 2011 01:52:18 +0100 Subject: [PATCH] All should work fine now on jenkins. For some reason Tox with jenkins and env names of the form platform-djangoversion-examples results in an OSError Permission denied. No clue why. --- examples/runtests.py | 2 +- tox.ini | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/runtests.py b/examples/runtests.py index e291e3120..fd79bc644 100644 --- a/examples/runtests.py +++ b/examples/runtests.py @@ -1,6 +1,6 @@ import os import sys -os.environ['DJANGO_SETTINGS_MODULE'] = 'examples.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' from django.conf import settings from django.test.utils import get_runner diff --git a/tox.ini b/tox.ini index 31c0d3743..d3f49c2cc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ -#This file is very NON-DRY because tox currently doesn't yet support interpolation like configparser does. -#There's ticket covering this at http://code.google.com/p/pytox/issues/detail?id=17#c0 +#This file is very NON-DRY because tox currently doesn't support interpolation like configparser does. +#There's a ticket covering this at http://code.google.com/p/pytox/issues/detail?id=17#c0 [tox] envlist= @@ -12,10 +12,10 @@ envlist= py25-django12e, py26-django12e, - py27-django12-examples, - py25-django13-examples, - py26-django13-examples, - py27-django13-examples + py27-django12e, + py25-django13e, + py26-django13e, + py27-django13e ########################################### CORE TESTS ############################################ @@ -96,7 +96,7 @@ deps= Markdown==2.0.3 https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip -[testenv:py27-django12-examples] +[testenv:py27-django12e] basepython=python2.7 commands= python examples/runtests.py @@ -123,7 +123,7 @@ deps= Markdown==2.0.3 https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip -[testenv:py26-django13-examples] +[testenv:py26-django13e] basepython=python2.6 commands= python examples/runtests.py @@ -136,7 +136,7 @@ deps= Markdown==2.0.3 https://github.com/downloads/markotibold/unittest-xml-reporting/unittest-xml-reporting-1.1.zip -[testenv:py27-django13-examples] +[testenv:py27-django13e] basepython=python2.7 commands= python examples/runtests.py