Modified template_tests for unittest2 discovery.

This commit is contained in:
Preston Timmons 2013-04-06 13:51:40 -05:00 committed by Carl Meyer
parent 44293c5c05
commit 3810dc3070
10 changed files with 11 additions and 11 deletions

View File

@ -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):

View File

@ -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.