diff --git a/tests/util/caches/test_response_cache.py b/tests/util/caches/test_response_cache.py
index 1e83ef2f33..025b73e32f 100644
--- a/tests/util/caches/test_response_cache.py
+++ b/tests/util/caches/test_response_cache.py
@@ -11,6 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
+from unittest.mock import Mock
+
from parameterized import parameterized
from twisted.internet import defer
@@ -60,10 +63,15 @@ class ResponseCacheTestCase(TestCase):
self.successResultOf(wrap_d),
"initial wrap result should be the same",
)
+
+ # a second call should return the result without a call to the wrapped function
+ unexpected = Mock(spec=())
+ wrap2_d = defer.ensureDeferred(cache.wrap(0, unexpected))
+ unexpected.assert_not_called()
self.assertEqual(
expected_result,
- self.successResultOf(cache.get(0)),
- "cache should have the result",
+ self.successResultOf(wrap2_d),
+ "cache should still have the result",
)
def test_cache_miss(self):
@@ -80,7 +88,7 @@ class ResponseCacheTestCase(TestCase):
self.successResultOf(wrap_d),
"initial wrap result should be the same",
)
- self.assertIsNone(cache.get(0), "cache should not have the result now")
+ self.assertCountEqual([], cache.keys(), "cache should not have the result now")
def test_cache_expire(self):
cache = self.with_cache("short_cache", ms=1000)
@@ -92,16 +100,20 @@ class ResponseCacheTestCase(TestCase):
)
self.assertEqual(expected_result, self.successResultOf(wrap_d))
+
+ # a second call should return the result without a call to the wrapped function
+ unexpected = Mock(spec=())
+ wrap2_d = defer.ensureDeferred(cache.wrap(0, unexpected))
+ unexpected.assert_not_called()
self.assertEqual(
expected_result,
- self.successResultOf(cache.get(0)),
+ self.successResultOf(wrap2_d),
"cache should still have the result",
)
# cache eviction timer is handled
self.reactor.pump((2,))
-
- self.assertIsNone(cache.get(0), "cache should not have the result now")
+ self.assertCountEqual([], cache.keys(), "cache should not have the result now")
def test_cache_wait_hit(self):
cache = self.with_cache("neutral_cache")
@@ -133,16 +145,21 @@ class ResponseCacheTestCase(TestCase):
self.reactor.pump((1, 1))
self.assertEqual(expected_result, self.successResultOf(wrap_d))
+
+ # a second call should immediately return the result without a call to the
+ # wrapped function
+ unexpected = Mock(spec=())
+ wrap2_d = defer.ensureDeferred(cache.wrap(0, unexpected))
+ unexpected.assert_not_called()
self.assertEqual(
expected_result,
- self.successResultOf(cache.get(0)),
+ self.successResultOf(wrap2_d),
"cache should still have the result",
)
# (1 + 1 + 2) > 3.0, cache eviction timer is handled
self.reactor.pump((2,))
-
- self.assertIsNone(cache.get(0), "cache should not have the result now")
+ self.assertCountEqual([], cache.keys(), "cache should not have the result now")
@parameterized.expand([(True,), (False,)])
def test_cache_context_nocache(self, should_cache: bool):
@@ -183,10 +200,16 @@ class ResponseCacheTestCase(TestCase):
self.assertEqual(expected_result, self.successResultOf(wrap2_d))
if should_cache:
+ unexpected = Mock(spec=())
+ wrap3_d = defer.ensureDeferred(cache.wrap(0, unexpected))
+ unexpected.assert_not_called()
self.assertEqual(
expected_result,
- self.successResultOf(cache.get(0)),
+ self.successResultOf(wrap3_d),
"cache should still have the result",
)
+
else:
- self.assertIsNone(cache.get(0), "cache should not have the result")
+ self.assertCountEqual(
+ [], cache.keys(), "cache should not have the result now"
+ )
diff --git a/tests/util/test_glob_to_regex.py b/tests/util/test_glob_to_regex.py
deleted file mode 100644
index 220accb92b..0000000000
--- a/tests/util/test_glob_to_regex.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021 The Matrix.org Foundation C.I.C.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-from synapse.util import glob_to_regex
-
-from tests.unittest import TestCase
-
-
-class GlobToRegexTestCase(TestCase):
- def test_literal_match(self):
- """patterns without wildcards should match"""
- pat = glob_to_regex("foobaz")
- self.assertTrue(
- pat.match("FoobaZ"), "patterns should match and be case-insensitive"
- )
- self.assertFalse(
- pat.match("x foobaz"), "pattern should not match at word boundaries"
- )
-
- def test_wildcard_match(self):
- pat = glob_to_regex("f?o*baz")
-
- self.assertTrue(
- pat.match("FoobarbaZ"),
- "* should match string and pattern should be case-insensitive",
- )
- self.assertTrue(pat.match("foobaz"), "* should match 0 characters")
- self.assertFalse(pat.match("fooxaz"), "the character after * must match")
- self.assertFalse(pat.match("fobbaz"), "? should not match 0 characters")
- self.assertFalse(pat.match("fiiobaz"), "? should not match 2 characters")
-
- def test_multi_wildcard(self):
- """patterns with multiple wildcards in a row should match"""
- pat = glob_to_regex("**baz")
- self.assertTrue(pat.match("agsgsbaz"), "** should match any string")
- self.assertTrue(pat.match("baz"), "** should match the empty string")
- self.assertEqual(pat.pattern, r"\A.{0,}baz\Z")
-
- pat = glob_to_regex("*?baz")
- self.assertTrue(pat.match("agsgsbaz"), "*? should match any string")
- self.assertTrue(pat.match("abaz"), "*? should match a single char")
- self.assertFalse(pat.match("baz"), "*? should not match the empty string")
- self.assertEqual(pat.pattern, r"\A.{1,}baz\Z")
-
- pat = glob_to_regex("a?*?*?baz")
- self.assertTrue(pat.match("a g baz"), "?*?*? should match 3 chars")
- self.assertFalse(pat.match("a..baz"), "?*?*? should not match 2 chars")
- self.assertTrue(pat.match("a.gg.baz"), "?*?*? should match 4 chars")
- self.assertEqual(pat.pattern, r"\Aa.{3,}baz\Z")
diff --git a/tests/util/test_logcontext.py b/tests/util/test_logcontext.py
index 5d9c4665aa..621b0f9fcd 100644
--- a/tests/util/test_logcontext.py
+++ b/tests/util/test_logcontext.py
@@ -152,46 +152,11 @@ class LoggingContextTestCase(unittest.TestCase):
# now it should be restored
self._check_test_key("one")
- @defer.inlineCallbacks
- def test_make_deferred_yieldable_on_non_deferred(self):
- """Check that make_deferred_yieldable does the right thing when its
- argument isn't actually a deferred"""
-
- with LoggingContext("one"):
- d1 = make_deferred_yieldable("bum")
- self._check_test_key("one")
-
- r = yield d1
- self.assertEqual(r, "bum")
- self._check_test_key("one")
-
def test_nested_logging_context(self):
with LoggingContext("foo"):
nested_context = nested_logging_context(suffix="bar")
self.assertEqual(nested_context.name, "foo-bar")
- @defer.inlineCallbacks
- def test_make_deferred_yieldable_with_await(self):
- # an async function which returns an incomplete coroutine, but doesn't
- # follow the synapse rules.
-
- async def blocking_function():
- d = defer.Deferred()
- reactor.callLater(0, d.callback, None)
- await d
-
- sentinel_context = current_context()
-
- with LoggingContext("one"):
- d1 = make_deferred_yieldable(blocking_function())
- # make sure that the context was reset by make_deferred_yieldable
- self.assertIs(current_context(), sentinel_context)
-
- yield d1
-
- # now it should be restored
- self._check_test_key("one")
-
# a function which returns a deferred which has been "called", but
# which had a function which returned another incomplete deferred on
|
