From 3810dc3070468abd3a3d9beec406a5aa3edd6b52 Mon Sep 17 00:00:00 2001
From: Preston Timmons <prestontimmons@gmail.com>
Date: Sat, 6 Apr 2013 13:51:40 -0500
Subject: [PATCH] Modified template_tests for unittest2 discovery.
---
.../{callables.py => test_callables.py} | 0
.../{context.py => test_context.py} | 0
.../{custom.py => test_custom.py} | 0
.../{loaders.py => test_loaders.py} | 0
.../{nodelist.py => test_nodelist.py} | 0
.../{parser.py => test_parser.py} | 0
.../{response.py => test_response.py} | 4 ++--
.../{smartif.py => test_smartif.py} | 0
.../{unicode.py => test_unicode.py} | 0
tests/template_tests/tests.py | 18 +++++++++---------
10 files changed, 11 insertions(+), 11 deletions(-)
rename tests/template_tests/{callables.py => test_callables.py} (100%)
rename tests/template_tests/{context.py => test_context.py} (100%)
rename tests/template_tests/{custom.py => test_custom.py} (100%)
rename tests/template_tests/{loaders.py => test_loaders.py} (100%)
rename tests/template_tests/{nodelist.py => test_nodelist.py} (100%)
rename tests/template_tests/{parser.py => test_parser.py} (100%)
rename tests/template_tests/{response.py => test_response.py} (98%)
rename tests/template_tests/{smartif.py => test_smartif.py} (100%)
rename tests/template_tests/{unicode.py => test_unicode.py} (100%)
diff --git a/tests/template_tests/callables.py b/tests/template_tests/test_callables.py
similarity index 100%
rename from tests/template_tests/callables.py
rename to tests/template_tests/test_callables.py
diff --git a/tests/template_tests/context.py b/tests/template_tests/test_context.py
similarity index 100%
rename from tests/template_tests/context.py
rename to tests/template_tests/test_context.py
diff --git a/tests/template_tests/custom.py b/tests/template_tests/test_custom.py
similarity index 100%
rename from tests/template_tests/custom.py
rename to tests/template_tests/test_custom.py
diff --git a/tests/template_tests/loaders.py b/tests/template_tests/test_loaders.py
similarity index 100%
rename from tests/template_tests/loaders.py
rename to tests/template_tests/test_loaders.py
diff --git a/tests/template_tests/nodelist.py b/tests/template_tests/test_nodelist.py
similarity index 100%
rename from tests/template_tests/nodelist.py
rename to tests/template_tests/test_nodelist.py
diff --git a/tests/template_tests/parser.py b/tests/template_tests/test_parser.py
similarity index 100%
rename from tests/template_tests/parser.py
rename to tests/template_tests/test_parser.py
diff --git a/tests/template_tests/response.py b/tests/template_tests/test_response.py
similarity index 98%
rename from tests/template_tests/response.py
rename to 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
similarity index 100%
rename from tests/template_tests/smartif.py
rename to tests/template_tests/test_smartif.py
diff --git a/tests/template_tests/unicode.py b/tests/template_tests/test_unicode.py
similarity index 100%
rename from tests/template_tests/unicode.py
rename to 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.