diff --git a/conftest.py b/conftest.py old mode 100644 new mode 100755 index f422ab2e..a7663e4e --- a/conftest.py +++ b/conftest.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python import os import sys @@ -38,14 +39,6 @@ + CMS_APP ) DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": ":memory:"}} -TEMPLATE_LOADERS = [ - "django.template.loaders.filesystem.Loader", - "django.template.loaders.app_directories.Loader", -] -STATICFILES_FINDERS = [ - "django.contrib.staticfiles.finders.FileSystemFinder", - "django.contrib.staticfiles.finders.AppDirectoriesFinder", -] TEMPLATE_CONTEXT_PROCESSORS = [ "django.template.context_processors.debug", "django.template.context_processors.request", @@ -79,9 +72,6 @@ LANGUAGES = (("en", "English"),) STATIC_URL = "/static/" MEDIA_URL = "/media/" -DEBUG = True -CMS_TEMPLATES = (("fullwidth.html", "Fullwidth"), ("page.html", "Normal page")) -PASSWORD_HASHERS = ("django.contrib.auth.hashers.MD5PasswordHasher",) MIGRATION_MODULES = {} URL_CONF = "tests.utils.urls" @@ -97,8 +87,8 @@ def pytest_configure(): TEMPLATES=TEMPLATES, DATABASES=DATABASES, SITE_ID=SITE_ID, + LANGUAGE_CODE=LANGUAGE_CODE, LANGUAGES=LANGUAGES, - CMS_CONFIRM_VERSION4=True, MIGRATION_MODULES=MIGRATION_MODULES, ROOT_URLCONF=URL_CONF, STATIC_URL=STATIC_URL, diff --git a/tests/test_models.py b/tests/test_models.py index ae80592f..e11d16e1 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -1,5 +1,3 @@ -from pprint import pprint - from django.core.exceptions import ValidationError from django.test import TestCase @@ -148,7 +146,3 @@ def test_respect_link_is_optional(self): # now we allow the link to be empty instance.link_is_optional = True instance.clean() - - def test_settings(self): - from django.conf import settings - pprint(settings.__dict__)