Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed test failures introduced in a5becad.

  • Loading branch information...
commit 780fa48f5fb81b2f0f58de95167abff84a6149aa 1 parent a5becad
@apollo13 apollo13 authored
Showing with 4 additions and 3 deletions.
  1. +4 −3 tests/admin_scripts/tests.py
View
7 tests/admin_scripts/tests.py
@@ -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 django.core.management import BaseCommand, CommandError
from django.db import connection
@@ -149,8 +150,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, '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):

1 comment on commit 780fa48

@jezdez
Owner

D'oh!

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