From d8341bf02444e58ff62afe04f15d9679a1b5b8f8 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Tue, 10 Feb 2015 07:51:02 -0500 Subject: [PATCH] Moved contrib.sites tests out of contrib. --- tests/sites_tests/__init__.py | 0 .../contrib/sites => tests/sites_tests}/tests.py | 13 ++++++------- 2 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 tests/sites_tests/__init__.py rename {django/contrib/sites => tests/sites_tests}/tests.py (95%) diff --git a/tests/sites_tests/__init__.py b/tests/sites_tests/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/django/contrib/sites/tests.py b/tests/sites_tests/tests.py similarity index 95% rename from django/contrib/sites/tests.py rename to tests/sites_tests/tests.py index f58c8076225..eeb6a44646e 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):