Skip to content

Commit 780fa48

Browse files
committed
Fixed test failures introduced in a5becad.
1 parent a5becad commit 780fa48

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tests/admin_scripts/tests.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
import sys
1515
import codecs
1616

17-
from django import conf, bin, get_version
17+
import django
18+
from django import conf, get_version
1819
from django.conf import settings
1920
from django.core.management import BaseCommand, CommandError
2021
from django.db import connection
@@ -149,8 +150,8 @@ def run_test(self, script, args, settings_file=None, apps=None):
149150
return out, err
150151

151152
def run_django_admin(self, args, settings_file=None):
152-
bin_dir = os.path.abspath(os.path.dirname(upath(bin.__file__)))
153-
return self.run_test(os.path.join(bin_dir, 'django-admin.py'), args, settings_file)
153+
script_dir = os.path.abspath(os.path.join(os.path.dirname(upath(django.__file__)), 'bin'))
154+
return self.run_test(os.path.join(script_dir, 'django-admin.py'), args, settings_file)
154155

155156
def run_manage(self, args, settings_file=None):
156157
def safe_remove(path):

0 commit comments

Comments
 (0)