From 2607fa901699916c4825f145fa8a84f49b8524ff Mon Sep 17 00:00:00 2001 From: Marc Tamlyn Date: Tue, 14 Jan 2014 15:43:27 +0000 Subject: Fixed #21774 -- Isolate all test urls from eachother. This (nearly) completes the work to isolate all the test modules from each other. This is now more important as importing models from another module will case PendingDeprecationWarnings if those modules are not in INSTALLED_APPS. The only remaining obvious dependencies are: - d.c.auth depends on d.c.admin (because of the is_admin flag to some views), but this is not so important and d.c.admin is in always_installed_apps - test_client_regress depends on test_client. Eventually these should become a single module, as the split serves no useful purpose. --- tests/admin_scripts/tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/admin_scripts') diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index e052a1a6d7..63ca63a6c0 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -1542,6 +1542,7 @@ class ArgumentOrder(AdminScriptTestCase): class StartProject(LiveServerTestCase, AdminScriptTestCase): + urls = 'admin_scripts.urls' available_apps = [ 'admin_scripts', 'django.contrib.auth', @@ -1649,7 +1650,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase): def test_custom_project_template_from_tarball_by_url(self): "Make sure the startproject management command is able to use a different project template from a tarball via a url" - template_url = '%s/admin_scripts/custom_templates/project_template.tgz' % self.live_server_url + template_url = '%s/custom_templates/project_template.tgz' % self.live_server_url args = ['startproject', '--template', template_url, 'urltestproject'] testproject_dir = os.path.join(test_dir, 'urltestproject') @@ -1662,7 +1663,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase): def test_project_template_tarball_url(self): "Startproject management command handles project template tar/zip balls from non-canonical urls" - template_url = '%s/admin_scripts/custom_templates/project_template.tgz/' % self.live_server_url + template_url = '%s/custom_templates/project_template.tgz/' % self.live_server_url args = ['startproject', '--template', template_url, 'urltestproject'] testproject_dir = os.path.join(test_dir, 'urltestproject') -- cgit v1.3