Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 7505abf95dbf901af704f485eb2180b37f8c5b16 1 parent 84291b7
Alex Gaynor alex authored
Showing with 4 additions and 2 deletions.
  1. +4 −2 tests/runtests.py
6 tests/runtests.py
View
@@ -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 @@ def paired_tests(paired_test, options, test_labels):
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)
Please sign in to comment.
Something went wrong with that request. Please try again.