Fix the tests

Fantomas42 · Apr 8, 2015 · 0fdfc2f · 0fdfc2f
1 parent db5a0f6
commit 0fdfc2f
Showing 1 changed file with 37 additions and 5 deletions.
diff --git a/app_namespace/tests/tests.py b/app_namespace/tests/tests.py
@@ -89,7 +89,16 @@ def test_load_template_source_dotted_namespace(self):
     TEMPLATE_LOADERS=(
         'app_namespace.Loader',
         'django.template.loaders.app_directories.Loader',
-    )
+    ),
+    TEMPLATES=[
+        {
+            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'OPTIONS': {
+                'loaders': ('app_namespace.Loader',
+                            'django.template.loaders.app_directories.Loader')
+            }
+        }
+    ]
 )
 class TemplateTestCase(TestCase):
     maxDiff = None
@@ -206,6 +215,7 @@ class MultiAppTestCase(TestCase):
     """
 
     def setUp(self):
+        super(MultiAppTestCase, self).setUp()
         # Create a temp directory containing apps
         # accessible on the PYTHONPATH.
         self.app_directory = tempfile.mkdtemp()
@@ -231,6 +241,7 @@ def setUp(self):
         settings.INSTALLED_APPS.extend(self.apps)
 
     def tearDown(self):
+        super(MultiAppTestCase, self).tearDown()
         sys.path.remove(self.app_directory)
         for app in self.apps:
             del sys.modules[app]
@@ -254,7 +265,17 @@ def multiple_extend_empty_namespace(self):
         TEMPLATE_LOADERS=(
             'app_namespace.Loader',
             'django.template.loaders.app_directories.Loader',
-        )
+        ),
+        TEMPLATES=[
+            {
+                'BACKEND': 'django.template.backends.django.DjangoTemplates',
+                'OPTIONS': {
+                    'loaders': (
+                        'app_namespace.Loader',
+                        'django.template.loaders.app_directories.Loader')
+                }
+            }
+        ]
     )
     def test_multiple_extend_empty_namespace(self):
         self.multiple_extend_empty_namespace()
@@ -265,10 +286,21 @@ def test_multiple_extend_empty_namespace(self):
         TEMPLATE_LOADERS=(
             ('django.template.loaders.cached.Loader', (
                 'app_namespace.Loader',
-                'django.template.loaders.app_directories.Loader',
-                )
+                'django.template.loaders.app_directories.Loader')
              ),
-        )
+        ),
+        TEMPLATES=[
+            {
+                'BACKEND': 'django.template.backends.django.DjangoTemplates',
+                'OPTIONS': {
+                    'loaders': [
+                        ('django.template.loaders.cached.Loader', [
+                            'app_namespace.Loader',
+                            'django.template.loaders.app_directories.Loader']),
+                    ]
+                }
+            }
+        ]
     )
     def test_cached_multiple_extend_empty_namespace(self):
         with self.assertRaises(RuntimeError):