summaryrefslogtreecommitdiff
path: root/tests/admin_scripts/tests.py
diff options
context:
space:
mode:
authorFlorian Apolloner <florian@apolloner.eu>2013-05-01 16:40:49 +0200
committerFlorian Apolloner <florian@apolloner.eu>2013-05-01 16:40:49 +0200
commit780fa48f5fb81b2f0f58de95167abff84a6149aa (patch)
treee25a1bcea4a8a45d5751d1cc9750b28df4233461 /tests/admin_scripts/tests.py
parenta5becad9094e5c5403b692b9a7b3a6ffaabf64a3 (diff)
Fixed test failures introduced in a5becad9094e5c5403b692b9a7b3a6ffaabf64a3.
Diffstat (limited to 'tests/admin_scripts/tests.py')
-rw-r--r--tests/admin_scripts/tests.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index baec16820e..5071977b2d 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/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, CommandError
from django.db import connection
@@ -149,8 +150,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):