From 0b0d98fd4ed2929a34d6540549baf96ed6c1910f Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Wed, 1 May 2013 16:40:49 +0200 Subject: [PATCH] [1.5.x] Fixed test failures introduced in a5becad9094e5c5403b692b9a7b3a6ffaabf64a3. Backport of 780fa48f5fb81b2f0f58de95167abff84a6149aa from master --- tests/regressiontests/admin_scripts/tests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index 6ac88adb6a..91bcbee15f 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -14,7 +14,8 @@ import subprocess import sys import codecs -from django import conf, bin, get_version +import django +from django import conf, get_version from django.conf import settings from django.core.management import BaseCommand from django.db import connection @@ -139,8 +140,8 @@ class AdminScriptTestCase(unittest.TestCase): return out, err def run_django_admin(self, args, settings_file=None): - bin_dir = os.path.abspath(os.path.dirname(upath(bin.__file__))) - return self.run_test(os.path.join(bin_dir, 'django-admin.py'), args, settings_file) + script_dir = os.path.abspath(os.path.join(os.path.dirname(upath(django.__file__)), 'bin')) + return self.run_test(os.path.join(script_dir, 'django-admin.py'), args, settings_file) def run_manage(self, args, settings_file=None): def safe_remove(path):