diff options
| author | Tim Graham <timograham@gmail.com> | 2015-02-10 07:51:02 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-11 11:50:23 -0500 |
| commit | 0520cfe94a1705d604e9425848fc90e6ca903059 (patch) | |
| tree | d0d90dbdd73d16c4c4357699662d71d36fc4d9ef | |
| parent | 36bf6ec9eb8a3ef4e24d3a6374780603f5bbdf97 (diff) | |
[1.8.x] Moved contrib.sites tests out of contrib.
Backport of d8341bf02444e58ff62afe04f15d9679a1b5b8f8 from master
| -rw-r--r-- | tests/sites_tests/__init__.py | 0 | ||||
| -rw-r--r-- | tests/sites_tests/tests.py (renamed from django/contrib/sites/tests.py) | 13 |
2 files changed, 6 insertions, 7 deletions
diff --git a/tests/sites_tests/__init__.py b/tests/sites_tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/sites_tests/__init__.py diff --git a/django/contrib/sites/tests.py b/tests/sites_tests/tests.py index f58c807622..eeb6a44646 100644 --- a/django/contrib/sites/tests.py +++ b/tests/sites_tests/tests.py @@ -2,19 +2,18 @@ from __future__ import unicode_literals from django.apps import apps from django.conf import settings +from django.contrib.sites import models +from django.contrib.sites.management import create_default_site +from django.contrib.sites.middleware import CurrentSiteMiddleware +from django.contrib.sites.models import Site, clear_site_cache +from django.contrib.sites.requests import RequestSite +from django.contrib.sites.shortcuts import get_current_site from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.db.models.signals import post_migrate from django.http import HttpRequest from django.test import TestCase, modify_settings, override_settings from django.test.utils import captured_stdout -from . import models -from .management import create_default_site -from .middleware import CurrentSiteMiddleware -from .models import Site, clear_site_cache -from .requests import RequestSite -from .shortcuts import get_current_site - @modify_settings(INSTALLED_APPS={'append': 'django.contrib.sites'}) class SitesFrameworkTests(TestCase): |
