Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed test failures introduced in a5becad.

  • Loading branch information...
commit 780fa48f5fb81b2f0f58de95167abff84a6149aa 1 parent a5becad
Florian Apolloner authored May 01, 2013

Showing 1 changed file with 4 additions and 3 deletions. Show diff stats Hide diff stats

  1. 7  tests/admin_scripts/tests.py
7  tests/admin_scripts/tests.py
@@ -14,7 +14,8 @@
14 14
 import sys
15 15
 import codecs
16 16
 
17  
-from django import conf, bin, get_version
  17
+import django
  18
+from django import conf, get_version
18 19
 from django.conf import settings
19 20
 from django.core.management import BaseCommand, CommandError
20 21
 from django.db import connection
@@ -149,8 +150,8 @@ def run_test(self, script, args, settings_file=None, apps=None):
149 150
         return out, err
150 151
 
151 152
     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)
154 155
 
155 156
     def run_manage(self, args, settings_file=None):
156 157
         def safe_remove(path):

1 note on commit 780fa48

Jannis Leidel
Owner
jezdez commented on 780fa48 May 01, 2013

D'oh!

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