|
54 | 54 |
|
55 | 55 | from django.conf import settings |
56 | 56 | from django.template import TemplateDoesNotExist |
| 57 | +from django.template.loaders.base import Loader as BaseLoader |
57 | 58 | from django.test.runner import DiscoverRunner |
58 | 59 | from django.core.management import call_command |
59 | 60 | from django.core.urlresolvers import RegexURLResolver |
@@ -106,11 +107,14 @@ def safe_destroy_0_1(*args, **kwargs): |
106 | 107 | settings.DATABASES["default"]["NAME"] = test_database_name |
107 | 108 | return old_destroy(*args, **kwargs) |
108 | 109 |
|
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 |
114 | 118 |
|
115 | 119 | class RecordUrlsMiddleware(object): |
116 | 120 | def process_request(self, request): |
@@ -385,7 +389,7 @@ def setup_test_environment(self, **kwargs): |
385 | 389 | }, |
386 | 390 | } |
387 | 391 |
|
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 |
389 | 393 | template_coverage_collection = True |
390 | 394 |
|
391 | 395 | settings.MIDDLEWARE_CLASSES = ('ietf.utils.test_runner.RecordUrlsMiddleware',) + settings.MIDDLEWARE_CLASSES |
|
0 commit comments