From 2730be8d1d8c0c4d679008a1e487fe74432210a5 Mon Sep 17 00:00:00 2001 From: Alastair Houghton Date: Wed, 15 Apr 2015 09:52:00 +0100 Subject: [PATCH] Made tests run, properly handle the case where a template is not found. --- overextends/templatetags/overextends_tags.py | 2 ++ test_project/settings.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/overextends/templatetags/overextends_tags.py b/overextends/templatetags/overextends_tags.py index e6ce442..322f659 100644 --- a/overextends/templatetags/overextends_tags.py +++ b/overextends/templatetags/overextends_tags.py @@ -90,6 +90,8 @@ class OverExtendsNode(ExtendsNode): # is requested. for loader in loaders: dirs = context[context_name][name] + if not dirs: + break try: source, path = loader.load_template_source(name, dirs) except TemplateDoesNotExist: diff --git a/test_project/settings.py b/test_project/settings.py index fc40d54..0607363 100644 --- a/test_project/settings.py +++ b/test_project/settings.py @@ -6,7 +6,13 @@ PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__)) PROJECT_DIRNAME = PROJECT_ROOT.split(os.sep)[-1] ROOT_URLCONF = "%s.urls" % PROJECT_DIRNAME TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates"),) -TEST_RUNNER = "django.test.simple.DjangoTestSuiteRunner" + +try: + import django.test.runner + TEST_RUNNER = "django.test.runner.DiscoverRunner" +except ImportError as e: + TEST_RUNNER = "django.test.simple.DjangoTestSuiteRunner" + SECRET_KEY = "hi mom" DATABASES = {