Ensure that the resize funciton is not shared between tests.

Author: clokep

tests/config/test_cache.py

@@ -14,14 +14,15 @@
 
 from unittest.mock import patch
 
-from synapse.config.cache import CacheConfig, add_resizable_cache
+from synapse.config.cache import CacheConfig, CacheProperties, add_resizable_cache
 from synapse.util.caches.lrucache import LruCache
 
 from tests.unittest import TestCase
 
 
-# Patch the global _CACHES so that each test runs against its own state.
+# Patch the global state so that each test runs in an isolated environment.
 @patch("synapse.config.cache._CACHES", new_callable=dict)
+@patch("synapse.config.cache.properties", new_callable=CacheProperties)
 class CacheConfigTests(TestCase):
     def setUp(self):
         # Reset caches before each test
@@ -30,7 +31,7 @@ def setUp(self):
     def tearDown(self):
         self.config.reset()
 
-    def test_individual_caches_from_environ(self, _caches):
+    def test_individual_caches_from_environ(self, _caches, _properties):
         """
         Individual cache factors will be loaded from the environment.
         """
@@ -43,7 +44,7 @@ def test_individual_caches_from_environ(self, _caches):
 
         self.assertEqual(dict(self.config.cache_factors), {"something_or_other": 2.0})
 
-    def test_config_overrides_environ(self, _caches):
+    def test_config_overrides_environ(self, _caches, _properties):
         """
         Individual cache factors defined in the environment will take precedence
         over those in the config.
@@ -60,7 +61,7 @@ def test_config_overrides_environ(self, _caches):
             {"foo": 1.0, "bar": 3.0, "something_or_other": 2.0},
         )
 
-    def test_individual_instantiated_before_config_load(self, _caches):
+    def test_individual_instantiated_before_config_load(self, _caches, _properties):
         """
         If a cache is instantiated before the config is read, it will be given
         the default cache size in the interim, and then resized once the config
@@ -76,7 +77,7 @@ def test_individual_instantiated_before_config_load(self, _caches):
 
         self.assertEqual(cache.max_size, 300)
 
-    def test_individual_instantiated_after_config_load(self, _caches):
+    def test_individual_instantiated_after_config_load(self, _caches, _properties):
         """
         If a cache is instantiated after the config is read, it will be
         immediately resized to the correct size given the per_cache_factor if
@@ -89,7 +90,7 @@ def test_individual_instantiated_after_config_load(self, _caches):
         add_resizable_cache("foo", cache_resize_callback=cache.set_cache_factor)
         self.assertEqual(cache.max_size, 200)
 
-    def test_global_instantiated_before_config_load(self, _caches):
+    def test_global_instantiated_before_config_load(self, _caches, _properties):
         """
         If a cache is instantiated before the config is read, it will be given
         the default cache size in the interim, and then resized to the new
@@ -104,7 +105,7 @@ def test_global_instantiated_before_config_load(self, _caches):
 
         self.assertEqual(cache.max_size, 400)
 
-    def test_global_instantiated_after_config_load(self, _caches):
+    def test_global_instantiated_after_config_load(self, _caches, _properties):
         """
         If a cache is instantiated after the config is read, it will be
         immediately resized to the correct size given the global factor if there
@@ -117,7 +118,7 @@ def test_global_instantiated_after_config_load(self, _caches):
         add_resizable_cache("foo", cache_resize_callback=cache.set_cache_factor)
         self.assertEqual(cache.max_size, 150)
 
-    def test_cache_with_asterisk_in_name(self, _caches):
+    def test_cache_with_asterisk_in_name(self, _caches, _properties):
         """Some caches have asterisks in their name, test that they are set correctly."""
 
         config = {
@@ -143,7 +144,7 @@ def test_cache_with_asterisk_in_name(self, _caches):
         add_resizable_cache("*cache_c*", cache_resize_callback=cache_c.set_cache_factor)
         self.assertEqual(cache_c.max_size, 200)
 
-    def test_apply_cache_factor_from_config(self, _caches):
+    def test_apply_cache_factor_from_config(self, _caches, _properties):
         """Caches can disable applying cache factor updates, mainly used by
         event cache size.
         """