From 8045678606eb91539b675fcb81f9ce7d46142039 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 21 Nov 2014 16:37:12 +0100 Subject: [PATCH] Test fixes to run on Django 1.7. --- tests/settings.py | 18 +++++-- tests/storage.py | 111 ++++++++++++++++++++--------------------- tests/test_admin.py | 1 + tests/test_database.py | 10 +--- tests/test_redis.py | 16 ++---- 5 files changed, 76 insertions(+), 80 deletions(-) diff --git a/tests/settings.py b/tests/settings.py index b457fc8..5d91248 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -8,9 +8,18 @@ from decimal import Decimal if django.VERSION[:2] < (1, 6): TEST_RUNNER = 'discover_runner.DiscoverRunner' - SECRET_KEY = 'cheese' +MIDDLEWARE_CLASSES = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +) + DATABASE_ENGINE = 'sqlite3' DATABASES = { @@ -48,10 +57,11 @@ CONSTANCE_CONFIG = { 'STRING_VALUE': ('Hello world', 'greetings'), 'UNICODE_VALUE': (six.u('Rivière-Bonjour'), 'greetings'), 'DECIMAL_VALUE': (Decimal('0.1'), 'the first release version'), - 'DATETIME_VALUE': (datetime(2010, 8, 23, 11, 29, 24), 'time of the first commit'), + 'DATETIME_VALUE': (datetime(2010, 8, 23, 11, 29, 24), + 'time of the first commit'), 'FLOAT_VALUE': (3.1415926536, 'PI'), - 'DATE_VALUE': (date(2010, 12, 24), 'Merry Chrismas'), - 'TIME_VALUE': (time(23, 59, 59), 'And happy New Year'), + 'DATE_VALUE': (date(2010, 12, 24), 'Merry Chrismas'), + 'TIME_VALUE': (time(23, 59, 59), 'And happy New Year'), } DEBUG = True diff --git a/tests/storage.py b/tests/storage.py index 006227b..abbdb68 100644 --- a/tests/storage.py +++ b/tests/storage.py @@ -1,5 +1,4 @@ # -*- encoding: utf-8 -*- -import sys import six from datetime import datetime, date, time from decimal import Decimal @@ -8,79 +7,79 @@ if six.PY3: def long(value): return value +from constance.config import Config + class StorageTestsMixin(object): + def setUp(self): + self.config = Config() + super(StorageTestsMixin, self).setUp() + def test_store(self): - # read defaults - del sys.modules['constance'] - from constance import config - self.assertEqual(config.INT_VALUE, 1) - self.assertEqual(config.LONG_VALUE, long(123456)) - self.assertEqual(config.BOOL_VALUE, True) - self.assertEqual(config.STRING_VALUE, 'Hello world') - self.assertEqual(config.UNICODE_VALUE, six.u('Rivière-Bonjour')) - self.assertEqual(config.DECIMAL_VALUE, Decimal('0.1')) - self.assertEqual(config.DATETIME_VALUE, datetime(2010, 8, 23, 11, 29, 24)) - self.assertEqual(config.FLOAT_VALUE, 3.1415926536) - self.assertEqual(config.DATE_VALUE, date(2010, 12, 24)) - self.assertEqual(config.TIME_VALUE, time(23, 59, 59)) + self.assertEqual(self.config.INT_VALUE, 1) + self.assertEqual(self.config.LONG_VALUE, long(123456)) + self.assertEqual(self.config.BOOL_VALUE, True) + self.assertEqual(self.config.STRING_VALUE, 'Hello world') + self.assertEqual(self.config.UNICODE_VALUE, six.u('Rivière-Bonjour')) + self.assertEqual(self.config.DECIMAL_VALUE, Decimal('0.1')) + self.assertEqual(self.config.DATETIME_VALUE, datetime(2010, 8, 23, 11, 29, 24)) + self.assertEqual(self.config.FLOAT_VALUE, 3.1415926536) + self.assertEqual(self.config.DATE_VALUE, date(2010, 12, 24)) + self.assertEqual(self.config.TIME_VALUE, time(23, 59, 59)) # set values - config.INT_VALUE = 100 - config.LONG_VALUE = long(654321) - config.BOOL_VALUE = False - config.STRING_VALUE = 'Beware the weeping angel' - config.UNICODE_VALUE = six.u('Québec') - config.DECIMAL_VALUE = Decimal('1.2') - config.DATETIME_VALUE = datetime(1977, 10, 2) - config.FLOAT_VALUE = 2.718281845905 - config.DATE_VALUE = date(2001, 12, 20) - config.TIME_VALUE = time(1, 59, 0) + self.config.INT_VALUE = 100 + self.config.LONG_VALUE = long(654321) + self.config.BOOL_VALUE = False + self.config.STRING_VALUE = 'Beware the weeping angel' + self.config.UNICODE_VALUE = six.u('Québec') + self.config.DECIMAL_VALUE = Decimal('1.2') + self.config.DATETIME_VALUE = datetime(1977, 10, 2) + self.config.FLOAT_VALUE = 2.718281845905 + self.config.DATE_VALUE = date(2001, 12, 20) + self.config.TIME_VALUE = time(1, 59, 0) # read again - self.assertEqual(config.INT_VALUE, 100) - self.assertEqual(config.LONG_VALUE, long(654321)) - self.assertEqual(config.BOOL_VALUE, False) - self.assertEqual(config.STRING_VALUE, 'Beware the weeping angel') - self.assertEqual(config.UNICODE_VALUE, six.u('Québec')) - self.assertEqual(config.DECIMAL_VALUE, Decimal('1.2')) - self.assertEqual(config.DATETIME_VALUE, datetime(1977, 10, 2)) - self.assertEqual(config.FLOAT_VALUE, 2.718281845905) - self.assertEqual(config.DATE_VALUE, date(2001, 12, 20)) - self.assertEqual(config.TIME_VALUE, time(1, 59, 0)) + self.assertEqual(self.config.INT_VALUE, 100) + self.assertEqual(self.config.LONG_VALUE, long(654321)) + self.assertEqual(self.config.BOOL_VALUE, False) + self.assertEqual(self.config.STRING_VALUE, 'Beware the weeping angel') + self.assertEqual(self.config.UNICODE_VALUE, six.u('Québec')) + self.assertEqual(self.config.DECIMAL_VALUE, Decimal('1.2')) + self.assertEqual(self.config.DATETIME_VALUE, datetime(1977, 10, 2)) + self.assertEqual(self.config.FLOAT_VALUE, 2.718281845905) + self.assertEqual(self.config.DATE_VALUE, date(2001, 12, 20)) + self.assertEqual(self.config.TIME_VALUE, time(1, 59, 0)) def test_nonexistent(self): - from constance import config try: - config.NON_EXISTENT + self.config.NON_EXISTENT except Exception as e: self.assertEqual(type(e), AttributeError) try: - config.NON_EXISTENT = 1 + self.config.NON_EXISTENT = 1 except Exception as e: self.assertEqual(type(e), AttributeError) def test_missing_values(self): - from constance import config - # set some values and leave out others - config.LONG_VALUE = long(654321) - config.BOOL_VALUE = False - config.UNICODE_VALUE = six.u('Québec') - config.DECIMAL_VALUE = Decimal('1.2') - config.DATETIME_VALUE = datetime(1977, 10, 2) - config.DATE_VALUE = date(2001, 12, 20) - config.TIME_VALUE = time(1, 59, 0) + self.config.LONG_VALUE = long(654321) + self.config.BOOL_VALUE = False + self.config.UNICODE_VALUE = six.u('Québec') + self.config.DECIMAL_VALUE = Decimal('1.2') + self.config.DATETIME_VALUE = datetime(1977, 10, 2) + self.config.DATE_VALUE = date(2001, 12, 20) + self.config.TIME_VALUE = time(1, 59, 0) - self.assertEqual(config.INT_VALUE, 1) # this should be the default value - self.assertEqual(config.LONG_VALUE, long(654321)) - self.assertEqual(config.BOOL_VALUE, False) - self.assertEqual(config.STRING_VALUE, 'Hello world') # this should be the default value - self.assertEqual(config.UNICODE_VALUE, six.u('Québec')) - self.assertEqual(config.DECIMAL_VALUE, Decimal('1.2')) - self.assertEqual(config.DATETIME_VALUE, datetime(1977, 10, 2)) - self.assertEqual(config.FLOAT_VALUE, 3.1415926536) # this should be the default value - self.assertEqual(config.DATE_VALUE, date(2001, 12, 20)) - self.assertEqual(config.TIME_VALUE, time(1, 59, 0)) + self.assertEqual(self.config.INT_VALUE, 1) # this should be the default value + self.assertEqual(self.config.LONG_VALUE, long(654321)) + self.assertEqual(self.config.BOOL_VALUE, False) + self.assertEqual(self.config.STRING_VALUE, 'Hello world') # this should be the default value + self.assertEqual(self.config.UNICODE_VALUE, six.u('Québec')) + self.assertEqual(self.config.DECIMAL_VALUE, Decimal('1.2')) + self.assertEqual(self.config.DATETIME_VALUE, datetime(1977, 10, 2)) + self.assertEqual(self.config.FLOAT_VALUE, 3.1415926536) # this should be the default value + self.assertEqual(self.config.DATE_VALUE, date(2001, 12, 20)) + self.assertEqual(self.config.TIME_VALUE, time(1, 59, 0)) diff --git a/tests/test_admin.py b/tests/test_admin.py index c0e3f1d..5ac9521 100644 --- a/tests/test_admin.py +++ b/tests/test_admin.py @@ -10,6 +10,7 @@ class TestAdmin(TestCase): model = Config def setUp(self): + super(TestAdmin, self).setUp() self.rf = RequestFactory() self.superuser = User.objects.create_superuser('admin', 'nimda', 'a@a.cz') self.normaluser = User.objects.create_user('normal', 'nimda', 'b@b.cz') diff --git a/tests/test_database.py b/tests/test_database.py index 00c90c1..83cb6b8 100644 --- a/tests/test_database.py +++ b/tests/test_database.py @@ -1,21 +1,15 @@ -import sys - from django.test import TestCase from constance import settings -from constance.config import Config - from tests.storage import StorageTestsMixin -class TestDatabase(TestCase, StorageTestsMixin): +class TestDatabase(StorageTestsMixin, TestCase): def setUp(self): + super(TestDatabase, self).setUp() self.old_backend = settings.BACKEND settings.BACKEND = 'constance.backends.database.DatabaseBackend' def tearDown(self): - del sys.modules['constance'] settings.BACKEND = self.old_backend - import constance - constance.config = Config() diff --git a/tests/test_redis.py b/tests/test_redis.py index 3d68712..06d2cbe 100644 --- a/tests/test_redis.py +++ b/tests/test_redis.py @@ -1,26 +1,18 @@ -import sys - from django.test import TestCase from constance import settings -from constance.config import Config from tests.storage import StorageTestsMixin -class TestRedis(TestCase, StorageTestsMixin): +class TestRedis(StorageTestsMixin, TestCase): def setUp(self): + super(TestRedis, self).setUp() self.old_backend = settings.BACKEND settings.BACKEND = 'constance.backends.redisd.RedisBackend' - del sys.modules['constance'] - from constance import config - config._backend._rd.clear() + self.config._backend._rd.clear() def tearDown(self): - del sys.modules['constance'] - from constance import config - config._backend._rd.clear() + self.config._backend._rd.clear() settings.BACKEND = self.old_backend - import constance - constance.config = Config()