Browse Source

Added cache to tests, fixed cache-sensitive tests

Rafał Pitoń 11 years ago
parent
commit
ad55706ba0
3 changed files with 13 additions and 8 deletions
  1. 2 3
      misago/conf/tests/test_settings.py
  2. 5 5
      misago/core/tests/test_cachebuster.py
  3. 6 0
      runtests.py

+ 2 - 3
misago/conf/tests/test_settings.py

@@ -3,6 +3,7 @@ from django.conf import settings as dj_settings
 from django.test import TestCase
 from django.test import TestCase
 
 
 from misago.core import threadstore
 from misago.core import threadstore
+from misago.core.cache import cache
 
 
 from misago.conf.gateway import settings as gateway
 from misago.conf.gateway import settings as gateway
 from misago.conf.dbsettings import db_settings
 from misago.conf.dbsettings import db_settings
@@ -11,9 +12,6 @@ from misago.conf.models import SettingsGroup, Setting
 
 
 
 
 class DBSettingsTests(TestCase):
 class DBSettingsTests(TestCase):
-    def tearDown(self):
-        threadstore.clear()
-
     def test_get_existing_setting(self):
     def test_get_existing_setting(self):
         """forum_name is defined"""
         """forum_name is defined"""
         self.assertEqual(db_settings.forum_name, 'Misago')
         self.assertEqual(db_settings.forum_name, 'Misago')
@@ -24,6 +22,7 @@ class DBSettingsTests(TestCase):
 
 
 class GatewaySettingsTests(TestCase):
 class GatewaySettingsTests(TestCase):
     def tearDown(self):
     def tearDown(self):
+        cache.clear()
         threadstore.clear()
         threadstore.clear()
 
 
     def test_get_existing_setting(self):
     def test_get_existing_setting(self):

+ 5 - 5
misago/core/tests/test_cachebuster.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 from django.test import TestCase
 
 
-from misago.core import cachebuster
-from misago.core import threadstore
+from misago.core import cachebuster, threadstore
+from misago.core.cache import cache
 from misago.core.models import CacheVersion
 from misago.core.models import CacheVersion
 
 
 
 
@@ -22,12 +22,12 @@ class CacheBusterTests(TestCase):
 
 
 class CacheBusterCacheTests(TestCase):
 class CacheBusterCacheTests(TestCase):
     def setUp(self):
     def setUp(self):
+        cache.clear()
+        threadstore.clear()
+
         self.cache_name = 'eric_the_fish'
         self.cache_name = 'eric_the_fish'
         cachebuster.register(self.cache_name)
         cachebuster.register(self.cache_name)
 
 
-    def tearDown(self):
-        threadstore.clear()
-
     def test_cache_validation(self):
     def test_cache_validation(self):
         """cache correctly validates"""
         """cache correctly validates"""
         version = cachebuster.get_version(self.cache_name)
         version = cachebuster.get_version(self.cache_name)

+ 6 - 0
runtests.py

@@ -27,6 +27,12 @@ def runtests():
                                                   "t3stpr0j3ct")
                                                   "t3stpr0j3ct")
             settings_file += """
             settings_file += """
 EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
 EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend'
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'uniqu3-sn0wf14k3'
+    }
+}
 """
 """
 
 
         if os.environ.get('TRAVIS'):
         if os.environ.get('TRAVIS'):