Skip to content
Browse files

[1.5.x] Fixed test failures introduced in a5becad.

Backport of 780fa48 from master
  • Loading branch information...
1 parent 4f10b35 commit 0b0d98fd4ed2929a34d6540549baf96ed6c1910f @apollo13 apollo13 committed
Showing with 4 additions and 3 deletions.
  1. +4 −3 tests/regressiontests/admin_scripts/
7 tests/regressiontests/admin_scripts/
@@ -14,7 +14,8 @@
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 import BaseCommand
from django.db import connection
@@ -139,8 +140,8 @@ def run_test(self, script, args, settings_file=None, apps=None):
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, ''), 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, ''), args, settings_file)
def run_manage(self, args, settings_file=None):
def safe_remove(path):

0 comments on commit 0b0d98f

Please sign in to comment.
Something went wrong with that request. Please try again.