diff options
| -rw-r--r-- | tests/template_tests/test_callables.py (renamed from tests/template_tests/callables.py) | 0 | ||||
| -rw-r--r-- | tests/template_tests/test_context.py (renamed from tests/template_tests/context.py) | 0 | ||||
| -rw-r--r-- | tests/template_tests/test_custom.py (renamed from tests/template_tests/custom.py) | 0 | ||||
| -rw-r--r-- | tests/template_tests/test_loaders.py (renamed from tests/template_tests/loaders.py) | 0 | ||||
| -rw-r--r-- | tests/template_tests/test_nodelist.py (renamed from tests/template_tests/nodelist.py) | 0 | ||||
| -rw-r--r-- | tests/template_tests/test_parser.py (renamed from tests/template_tests/parser.py) | 0 | ||||
| -rw-r--r-- | tests/template_tests/test_response.py (renamed from tests/template_tests/response.py) | 4 | ||||
| -rw-r--r-- | tests/template_tests/test_smartif.py (renamed from tests/template_tests/smartif.py) | 0 | ||||
| -rw-r--r-- | tests/template_tests/test_unicode.py (renamed from tests/template_tests/unicode.py) | 0 | ||||
| -rw-r--r-- | tests/template_tests/tests.py | 18 |
10 files changed, 11 insertions, 11 deletions
diff --git a/tests/template_tests/callables.py b/tests/template_tests/test_callables.py index 882a8c6e06..882a8c6e06 100644 --- a/tests/template_tests/callables.py +++ b/tests/template_tests/test_callables.py diff --git a/tests/template_tests/context.py b/tests/template_tests/test_context.py index 05c1dd57b9..05c1dd57b9 100644 --- a/tests/template_tests/context.py +++ b/tests/template_tests/test_context.py diff --git a/tests/template_tests/custom.py b/tests/template_tests/test_custom.py index 4aea08237d..4aea08237d 100644 --- a/tests/template_tests/custom.py +++ b/tests/template_tests/test_custom.py diff --git a/tests/template_tests/loaders.py b/tests/template_tests/test_loaders.py index b77965203f..b77965203f 100644 --- a/tests/template_tests/loaders.py +++ b/tests/template_tests/test_loaders.py diff --git a/tests/template_tests/nodelist.py b/tests/template_tests/test_nodelist.py index 97aa5af6a7..97aa5af6a7 100644 --- a/tests/template_tests/nodelist.py +++ b/tests/template_tests/test_nodelist.py diff --git a/tests/template_tests/parser.py b/tests/template_tests/test_parser.py index 9422da80d7..9422da80d7 100644 --- a/tests/template_tests/parser.py +++ b/tests/template_tests/test_parser.py diff --git a/tests/template_tests/response.py b/tests/template_tests/test_response.py index d0ab121b02..6acc45626f 100644 --- a/tests/template_tests/response.py +++ b/tests/template_tests/test_response.py @@ -15,7 +15,7 @@ from django.utils._os import upath def test_processor(request): return {'processors': 'yes'} -test_processor_name = 'template_tests.response.test_processor' +test_processor_name = 'template_tests.test_response.test_processor' # A test middleware that installs a temporary URLConf @@ -303,7 +303,7 @@ class CustomURLConfTest(TestCase): def setUp(self): self.old_MIDDLEWARE_CLASSES = settings.MIDDLEWARE_CLASSES settings.MIDDLEWARE_CLASSES = list(settings.MIDDLEWARE_CLASSES) + [ - 'template_tests.response.CustomURLConfMiddleware' + 'template_tests.test_response.CustomURLConfMiddleware' ] def tearDown(self): diff --git a/tests/template_tests/smartif.py b/tests/template_tests/test_smartif.py index 3a705ca663..3a705ca663 100644 --- a/tests/template_tests/smartif.py +++ b/tests/template_tests/test_smartif.py diff --git a/tests/template_tests/unicode.py b/tests/template_tests/test_unicode.py index 7cb2a28d15..7cb2a28d15 100644 --- a/tests/template_tests/unicode.py +++ b/tests/template_tests/test_unicode.py diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py index a9db9edc2f..67839d3ab7 100644 --- a/tests/template_tests/tests.py +++ b/tests/template_tests/tests.py @@ -36,18 +36,18 @@ from django.utils.safestring import mark_safe from django.utils import six from django.utils.tzinfo import LocalTimezone -from .callables import CallableVariablesTests -from .context import ContextTests -from .custom import CustomTagTests, CustomFilterTests -from .parser import ParserTests -from .unicode import UnicodeTests -from .nodelist import NodelistTest, ErrorIndexTest -from .smartif import SmartIfTests -from .response import (TemplateResponseTest, CacheMiddlewareTest, +from .test_callables import CallableVariablesTests +from .test_context import ContextTests +from .test_custom import CustomTagTests, CustomFilterTests +from .test_parser import ParserTests +from .test_unicode import UnicodeTests +from .test_nodelist import NodelistTest, ErrorIndexTest +from .test_smartif import SmartIfTests +from .test_response import (TemplateResponseTest, CacheMiddlewareTest, SimpleTemplateResponseTest, CustomURLConfTest) try: - from .loaders import RenderToStringTest, EggLoaderTest + from .test_loaders import RenderToStringTest, EggLoaderTest except ImportError as e: if "pkg_resources" in e.args[0]: pass # If setuptools isn't installed, that's fine. Just move on. |
