From 7505abf95dbf901af704f485eb2180b37f8c5b16 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 27 Jan 2011 00:00:20 +0000 Subject: [PATCH] Fixed using --pair with python's that aren't the system default, when not in the tests directory, and when using the global DJANGO_SETTINGS_MODULE env var. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15332 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/runtests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/runtests.py b/tests/runtests.py index 8b7def6323..f30d7c01a3 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -224,7 +224,7 @@ def bisect_tests(bisection_label, options, test_labels): except ValueError: pass - subprocess_args = ['python','runtests.py', '--settings=%s' % options.settings] + subprocess_args = [sys.executable, __file__, '--settings=%s' % options.settings] if options.failfast: subprocess_args.append('--failfast') if options.verbosity: @@ -284,7 +284,7 @@ def paired_tests(paired_test, options, test_labels): except ValueError: pass - subprocess_args = ['python','runtests.py', '--settings=%s' % options.settings] + subprocess_args = [sys.executable, __file__, '--settings=%s' % options.settings] if options.failfast: subprocess_args.append('--failfast') if options.verbosity: @@ -325,6 +325,8 @@ if __name__ == "__main__": elif "DJANGO_SETTINGS_MODULE" not in os.environ: parser.error("DJANGO_SETTINGS_MODULE is not set in the environment. " "Set it or use --settings.") + else: + options.settings = os.environ['DJANGO_SETTINGS_MODULE'] if options.bisect: bisect_tests(options.bisect, options, args)