From 9378da0590e3fcb8817d0c0309413bf59083ae8b Mon Sep 17 00:00:00 2001 From: Stephen Burrows Date: Wed, 27 Apr 2011 11:35:16 -0400 Subject: [PATCH] Tweaked template tests to use PEP 8 imports and the new setup_test_template_loader utility from django.test.utils. --- tests.py | 33 +++++++++++++++------------------ validators.py | 2 +- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/tests.py b/tests.py index 96ac7b6..a0e0184 100644 --- a/tests.py +++ b/tests.py @@ -1,13 +1,17 @@ -from django.test import TestCase +import sys +import traceback + from django import template from django.conf import settings from django.db import connection from django.template import loader from django.template.loaders import cached +from django.test import TestCase +from django.test.utils import setup_test_template_loader + +from philo.contrib.penfield.models import Blog, BlogView, BlogEntry from philo.exceptions import AncestorDoesNotExist from philo.models import Node, Page, Template -from philo.contrib.penfield.models import Blog, BlogView, BlogEntry -import sys, traceback class TemplateTestCase(TestCase): @@ -17,19 +21,15 @@ class TemplateTestCase(TestCase): "Tests to make sure that embed behaves with complex includes and extends" template_tests = self.get_template_tests() - # Register our custom template loader. Shamelessly cribbed from django core regressiontests. - def test_template_loader(template_name, template_dirs=None): - "A custom template loader that loads the unit-test templates." - try: - return (template_tests[template_name][0] , "test:%s" % template_name) - except KeyError: - raise template.TemplateDoesNotExist, template_name - - cache_loader = cached.Loader(('test_template_loader',)) - cache_loader._cached_loaders = (test_template_loader,) + # Register our custom template loader. Shamelessly cribbed from django/tests/regressiontests/templates/tests.py:384. + cache_loader = setup_test_template_loader( + dict([(name, t[0]) for name, t in template_tests.iteritems()]), + use_cached_loader=True, + ) - old_template_loaders = loader.template_source_loaders - loader.template_source_loaders = [cache_loader] + failures = [] + tests = template_tests.items() + tests.sort() # Turn TEMPLATE_DEBUG off, because tests assume that. old_td, settings.TEMPLATE_DEBUG = settings.TEMPLATE_DEBUG, False @@ -38,9 +38,6 @@ class TemplateTestCase(TestCase): old_invalid = settings.TEMPLATE_STRING_IF_INVALID expected_invalid_str = 'INVALID' - failures = [] - tests = template_tests.items() - tests.sort() # Run tests for name, vals in tests: xx, context, result = vals diff --git a/validators.py b/validators.py index 5ae9409..c8e5dc9 100644 --- a/validators.py +++ b/validators.py @@ -118,7 +118,7 @@ class TemplateValidationParser(Parser): def linebreak_iter(template_source): - # Cribbed from django/views/debug.py + # Cribbed from django/views/debug.py:18 yield 0 p = template_source.find('\n') while p >= 0: -- 2.20.1