Skip to content

Commit 8d1aca1

Browse files
committed
Rewrote the template coverage loader function to a proper template loader class.
- Legacy-Id: 12261
1 parent f690333 commit 8d1aca1

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

ietf/utils/test_runner.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454

5555
from django.conf import settings
5656
from django.template import TemplateDoesNotExist
57+
from django.template.loaders.base import Loader as BaseLoader
5758
from django.test.runner import DiscoverRunner
5859
from django.core.management import call_command
5960
from django.core.urlresolvers import RegexURLResolver
@@ -106,11 +107,14 @@ def safe_destroy_0_1(*args, **kwargs):
106107
settings.DATABASES["default"]["NAME"] = test_database_name
107108
return old_destroy(*args, **kwargs)
108109

109-
def template_coverage_loader(template_name, dirs):
110-
if template_coverage_collection == True:
111-
loaded_templates.add(str(template_name))
112-
raise TemplateDoesNotExist
113-
template_coverage_loader.is_usable = True
110+
class TemplateCoverageLoader(BaseLoader):
111+
is_usable = True
112+
113+
def load_template_source(self, template_name, dirs):
114+
if template_coverage_collection == True:
115+
loaded_templates.add(str(template_name))
116+
raise TemplateDoesNotExist
117+
load_template_source.is_usable = True
114118

115119
class RecordUrlsMiddleware(object):
116120
def process_request(self, request):
@@ -385,7 +389,7 @@ def setup_test_environment(self, **kwargs):
385389
},
386390
}
387391

388-
settings.TEMPLATE_LOADERS = ('ietf.utils.test_runner.template_coverage_loader',) + settings.TEMPLATE_LOADERS
392+
settings.TEMPLATE_LOADERS = ('ietf.utils.test_runner.TemplateCoverageLoader',) + settings.TEMPLATE_LOADERS
389393
template_coverage_collection = True
390394

391395
settings.MIDDLEWARE_CLASSES = ('ietf.utils.test_runner.RecordUrlsMiddleware',) + settings.MIDDLEWARE_CLASSES

0 commit comments

Comments
 (0)