p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Backport of 780fa48f5f from master
This commit is contained in:
Florian Apolloner 2013-05-01 16:40:49 +02:00
parent 4f10b35a2e
commit 0b0d98fd4e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/regressiontests/admin_scripts/tests.py
View File

@ -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
from django.db import connection
@ -139,8 +140,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):