diff --git a/tests/util/caches/test_deferred_cache.py b/tests/util/caches/test_deferred_cache.py
index c613ce3f10..02b99b466a 100644
--- a/tests/util/caches/test_deferred_cache.py
+++ b/tests/util/caches/test_deferred_cache.py
@@ -31,7 +31,7 @@ class DeferredCacheTestCase(TestCase):
cache = DeferredCache("test")
cache.prefill("foo", 123)
- self.assertEquals(self.successResultOf(cache.get("foo")), 123)
+ self.assertEqual(self.successResultOf(cache.get("foo")), 123)
def test_hit_deferred(self):
cache = DeferredCache("test")
diff --git a/tests/util/caches/test_descriptors.py b/tests/util/caches/test_descriptors.py
index ced3efd93f..b92d3f0c1b 100644
--- a/tests/util/caches/test_descriptors.py
+++ b/tests/util/caches/test_descriptors.py
@@ -434,8 +434,8 @@ class CacheDecoratorTestCase(unittest.HomeserverTestCase):
a = A()
- self.assertEquals((yield a.func("foo")), "foo")
- self.assertEquals((yield a.func("bar")), "bar")
+ self.assertEqual((yield a.func("foo")), "foo")
+ self.assertEqual((yield a.func("bar")), "bar")
@defer.inlineCallbacks
def test_hit(self):
@@ -450,10 +450,10 @@ class CacheDecoratorTestCase(unittest.HomeserverTestCase):
a = A()
yield a.func("foo")
- self.assertEquals(callcount[0], 1)
+ self.assertEqual(callcount[0], 1)
- self.assertEquals((yield a.func("foo")), "foo")
- self.assertEquals(callcount[0], 1)
+ self.assertEqual((yield a.func("foo")), "foo")
+ self.assertEqual(callcount[0], 1)
@defer.inlineCallbacks
def test_invalidate(self):
@@ -468,13 +468,13 @@ class CacheDecoratorTestCase(unittest.HomeserverTestCase):
a = A()
yield a.func("foo")
- self.assertEquals(callcount[0], 1)
+ self.assertEqual(callcount[0], 1)
a.func.invalidate(("foo",))
yield a.func("foo")
- self.assertEquals(callcount[0], 2)
+ self.assertEqual(callcount[0], 2)
def test_invalidate_missing(self):
class A:
@@ -499,7 +499,7 @@ class CacheDecoratorTestCase(unittest.HomeserverTestCase):
for k in range(0, 12):
yield a.func(k)
- self.assertEquals(callcount[0], 12)
+ self.assertEqual(callcount[0], 12)
# There must have been at least 2 evictions, meaning if we calculate
# all 12 values again, we must get called at least 2 more times
@@ -525,8 +525,8 @@ class CacheDecoratorTestCase(unittest.HomeserverTestCase):
a.func.prefill(("foo",), 456)
- self.assertEquals(a.func("foo").result, 456)
- self.assertEquals(callcount[0], 0)
+ self.assertEqual(a.func("foo").result, 456)
+ self.assertEqual(callcount[0], 0)
@defer.inlineCallbacks
def test_invalidate_context(self):
@@ -547,19 +547,19 @@ class CacheDecoratorTestCase(unittest.HomeserverTestCase):
a = A()
yield a.func2("foo")
- self.assertEquals(callcount[0], 1)
- self.assertEquals(callcount2[0], 1)
+ self.assertEqual(callcount[0], 1)
+ self.assertEqual(callcount2[0], 1)
a.func.invalidate(("foo",))
yield a.func("foo")
- self.assertEquals(callcount[0], 2)
- self.assertEquals(callcount2[0], 1)
+ self.assertEqual(callcount[0], 2)
+ self.assertEqual(callcount2[0], 1)
yield a.func2("foo")
- self.assertEquals(callcount[0], 2)
- self.assertEquals(callcount2[0], 2)
+ self.assertEqual(callcount[0], 2)
+ self.assertEqual(callcount2[0], 2)
@defer.inlineCallbacks
def test_eviction_context(self):
@@ -581,22 +581,22 @@ class CacheDecoratorTestCase(unittest.HomeserverTestCase):
yield a.func2("foo")
yield a.func2("foo2")
- self.assertEquals(callcount[0], 2)
- self.assertEquals(callcount2[0], 2)
+ self.assertEqual(callcount[0], 2)
+ self.assertEqual(callcount2[0], 2)
yield a.func2("foo")
- self.assertEquals(callcount[0], 2)
- self.assertEquals(callcount2[0], 2)
+ self.assertEqual(callcount[0], 2)
+ self.assertEqual(callcount2[0], 2)
yield a.func("foo3")
- self.assertEquals(callcount[0], 3)
- self.assertEquals(callcount2[0], 2)
+ self.assertEqual(callcount[0], 3)
+ self.assertEqual(callcount2[0], 2)
yield a.func2("foo")
- self.assertEquals(callcount[0], 4)
- self.assertEquals(callcount2[0], 3)
+ self.assertEqual(callcount[0], 4)
+ self.assertEqual(callcount2[0], 3)
@defer.inlineCallbacks
def test_double_get(self):
@@ -619,30 +619,30 @@ class CacheDecoratorTestCase(unittest.HomeserverTestCase):
yield a.func2("foo")
- self.assertEquals(callcount[0], 1)
- self.assertEquals(callcount2[0], 1)
+ self.assertEqual(callcount[0], 1)
+ self.assertEqual(callcount2[0], 1)
a.func2.invalidate(("foo",))
- self.assertEquals(a.func2.cache.cache.del_multi.call_count, 1)
+ self.assertEqual(a.func2.cache.cache.del_multi.call_count, 1)
yield a.func2("foo")
a.func2.invalidate(("foo",))
- self.assertEquals(a.func2.cache.cache.del_multi.call_count, 2)
+ self.assertEqual(a.func2.cache.cache.del_multi.call_count, 2)
- self.assertEquals(callcount[0], 1)
- self.assertEquals(callcount2[0], 2)
+ self.assertEqual(callcount[0], 1)
+ self.assertEqual(callcount2[0], 2)
a.func.invalidate(("foo",))
- self.assertEquals(a.func2.cache.cache.del_multi.call_count, 3)
+ self.assertEqual(a.func2.cache.cache.del_multi.call_count, 3)
yield a.func("foo")
- self.assertEquals(callcount[0], 2)
- self.assertEquals(callcount2[0], 2)
+ self.assertEqual(callcount[0], 2)
+ self.assertEqual(callcount2[0], 2)
yield a.func2("foo")
- self.assertEquals(callcount[0], 2)
- self.assertEquals(callcount2[0], 3)
+ self.assertEqual(callcount[0], 2)
+ self.assertEqual(callcount2[0], 3)
class CachedListDescriptorTestCase(unittest.TestCase):
diff --git a/tests/util/test_expiring_cache.py b/tests/util/test_expiring_cache.py
index e6e13ba06c..7f60aae5ba 100644
--- a/tests/util/test_expiring_cache.py
+++ b/tests/util/test_expiring_cache.py
@@ -26,8 +26,8 @@ class ExpiringCacheTestCase(unittest.HomeserverTestCase):
cache = ExpiringCache("test", clock, max_len=1)
cache["key"] = "value"
- self.assertEquals(cache.get("key"), "value")
- self.assertEquals(cache["key"], "value")
+ self.assertEqual(cache.get("key"), "value")
+ self.assertEqual(cache["key"], "value")
def test_eviction(self):
clock = MockClock()
@@ -35,13 +35,13 @@ class ExpiringCacheTestCase(unittest.HomeserverTestCase):
cache["key"] = "value"
cache["key2"] = "value2"
- self.assertEquals(cache.get("key"), "value")
- self.assertEquals(cache.get("key2"), "value2")
+ self.assertEqual(cache.get("key"), "value")
+ self.assertEqual(cache.get("key2"), "value2")
cache["key3"] = "value3"
- self.assertEquals(cache.get("key"), None)
- self.assertEquals(cache.get("key2"), "value2")
- self.assertEquals(cache.get("key3"), "value3")
+ self.assertEqual(cache.get("key"), None)
+ self.assertEqual(cache.get("key2"), "value2")
+ self.assertEqual(cache.get("key3"), "value3")
def test_iterable_eviction(self):
clock = MockClock()
@@ -51,15 +51,15 @@ class ExpiringCacheTestCase(unittest.HomeserverTestCase):
cache["key2"] = [2, 3]
cache["key3"] = [4, 5]
- self.assertEquals(cache.get("key"), [1])
- self.assertEquals(cache.get("key2"), [2, 3])
- self.assertEquals(cache.get("key3"), [4, 5])
+ self.assertEqual(cache.get("key"), [1])
+ self.assertEqual(cache.get("key2"), [2, 3])
+ self.assertEqual(cache.get("key3"), [4, 5])
cache["key4"] = [6, 7]
- self.assertEquals(cache.get("key"), None)
- self.assertEquals(cache.get("key2"), None)
- self.assertEquals(cache.get("key3"), [4, 5])
- self.assertEquals(cache.get("key4"), [6, 7])
+ self.assertEqual(cache.get("key"), None)
+ self.assertEqual(cache.get("key2"), None)
+ self.assertEqual(cache.get("key3"), [4, 5])
+ self.assertEqual(cache.get("key4"), [6, 7])
def test_time_eviction(self):
clock = MockClock()
@@ -69,13 +69,13 @@ class ExpiringCacheTestCase(unittest.HomeserverTestCase):
clock.advance_time(0.5)
cache["key2"] = 2
- self.assertEquals(cache.get("key"), 1)
- self.assertEquals(cache.get("key2"), 2)
+ self.assertEqual(cache.get("key"), 1)
+ self.assertEqual(cache.get("key2"), 2)
clock.advance_time(0.9)
- self.assertEquals(cache.get("key"), None)
- self.assertEquals(cache.get("key2"), 2)
+ self.assertEqual(cache.get("key"), None)
+ self.assertEqual(cache.get("key2"), 2)
clock.advance_time(1)
- self.assertEquals(cache.get("key"), None)
- self.assertEquals(cache.get("key2"), None)
+ self.assertEqual(cache.get("key"), None)
+ self.assertEqual(cache.get("key2"), None)
diff --git a/tests/util/test_logcontext.py b/tests/util/test_logcontext.py
index 621b0f9fcd..2ad321e184 100644
--- a/tests/util/test_logcontext.py
+++ b/tests/util/test_logcontext.py
@@ -17,7 +17,7 @@ from .. import unittest
class LoggingContextTestCase(unittest.TestCase):
def _check_test_key(self, value):
- self.assertEquals(current_context().name, value)
+ self.assertEqual(current_context().name, value)
def test_with_context(self):
with LoggingContext("test"):
diff --git a/tests/util/test_lrucache.py b/tests/util/test_lrucache.py
index 291644eb7d..321fc1776f 100644
--- a/tests/util/test_lrucache.py
+++ b/tests/util/test_lrucache.py
@@ -27,37 +27,37 @@ class LruCacheTestCase(unittest.HomeserverTestCase):
def test_get_set(self):
cache = LruCache(1)
cache["key"] = "value"
- self.assertEquals(cache.get("key"), "value")
- self.assertEquals(cache["key"], "value")
+ self.assertEqual(cache.get("key"), "value")
+ self.assertEqual(cache["key"], "value")
def test_eviction(self):
cache = LruCache(2)
cache[1] = 1
cache[2] = 2
- self.assertEquals(cache.get(1), 1)
- self.assertEquals(cache.get(2), 2)
+ self.assertEqual(cache.get(1), 1)
+ self.assertEqual(cache.get(2), 2)
cache[3] = 3
- self.assertEquals(cache.get(1), None)
- self.assertEquals(cache.get(2), 2)
- self.assertEquals(cache.get(3), 3)
+ self.assertEqual(cache.get(1), None)
+ self.assertEqual(cache.get(2), 2)
+ self.assertEqual(cache.get(3), 3)
def test_setdefault(self):
cache = LruCache(1)
- self.assertEquals(cache.setdefault("key", 1), 1)
- self.assertEquals(cache.get("key"), 1)
- self.assertEquals(cache.setdefault("key", 2), 1)
- self.assertEquals(cache.get("key"), 1)
+ self.assertEqual(cache.setdefault("key", 1), 1)
+ self.assertEqual(cache.get("key"), 1)
+ self.assertEqual(cache.setdefault("key", 2), 1)
+ self.assertEqual(cache.get("key"), 1)
cache["key"] = 2 # Make sure overriding works.
- self.assertEquals(cache.get("key"), 2)
+ self.assertEqual(cache.get("key"), 2)
def test_pop(self):
cache = LruCache(1)
cache["key"] = 1
- self.assertEquals(cache.pop("key"), 1)
- self.assertEquals(cache.pop("key"), None)
+ self.assertEqual(cache.pop("key"), 1)
+ self.assertEqual(cache.pop("key"), None)
def test_del_multi(self):
cache = LruCache(4, cache_type=TreeCache)
@@ -66,23 +66,23 @@ class LruCacheTestCase(unittest.HomeserverTestCase):
cache[("vehicles", "car")] = "vroom"
cache[("vehicles", "train")] = "chuff"
- self.assertEquals(len(cache), 4)
+ self.assertEqual(len(cache), 4)
- self.assertEquals(cache.get(("animal", "cat")), "mew")
- self.assertEquals(cache.get(("vehicles", "car")), "vroom")
+ self.assertEqual(cache.get(("animal", "cat")), "mew")
+ self.assertEqual(cache.get(("vehicles", "car")), "vroom")
cache.del_multi(("animal",))
- self.assertEquals(len(cache), 2)
- self.assertEquals(cache.get(("animal", "cat")), None)
- self.assertEquals(cache.get(("animal", "dog")), None)
- self.assertEquals(cache.get(("vehicles", "car")), "vroom")
- self.assertEquals(cache.get(("vehicles", "train")), "chuff")
+ self.assertEqual(len(cache), 2)
+ self.assertEqual(cache.get(("animal", "cat")), None)
+ self.assertEqual(cache.get(("animal", "dog")), None)
+ self.assertEqual(cache.get(("vehicles", "car")), "vroom")
+ self.assertEqual(cache.get(("vehicles", "train")), "chuff")
# Man from del_multi say "Yes".
def test_clear(self):
cache = LruCache(1)
cache["key"] = 1
cache.clear()
- self.assertEquals(len(cache), 0)
+ self.assertEqual(len(cache), 0)
@override_config({"caches": {"per_cache_factors": {"mycache": 10}}})
def test_special_size(self):
@@ -105,10 +105,10 @@ class LruCacheCallbacksTestCase(unittest.HomeserverTestCase):
self.assertFalse(m.called)
cache.set("key", "value2")
- self.assertEquals(m.call_count, 1)
+ self.assertEqual(m.call_count, 1)
cache.set("key", "value")
- self.assertEquals(m.call_count, 1)
+ self.assertEqual(m.call_count, 1)
def test_multi_get(self):
m = Mock()
@@ -124,10 +124,10 @@ class LruCacheCallbacksTestCase(unittest.HomeserverTestCase):
self.assertFalse(m.called)
cache.set("key", "value2")
- self.assertEquals(m.call_count, 1)
+ self.assertEqual(m.call_count, 1)
cache.set("key", "value")
- self.assertEquals(m.call_count, 1)
+ self.assertEqual(m.call_count, 1)
def test_set(self):
m = Mock()
@@ -140,10 +140,10 @@ class LruCacheCallbacksTestCase(unittest.HomeserverTestCase):
self.assertFalse(m.called)
cache.set("key", "value2")
- self.assertEquals(m.call_count, 1)
+ self.assertEqual(m.call_count, 1)
cache.set("key", "value")
- self.assertEquals(m.call_count, 1)
+ self.assertEqual(m.call_count, 1)
def test_pop(self):
m = Mock()
@@ -153,13 +153,13 @@ class LruCacheCallbacksTestCase(unittest.HomeserverTestCase):
self.assertFalse(m.called)
cache.pop("key")
- self.assertEquals(m.call_count, 1)
+ self.assertEqual(m.call_count, 1)
cache.set("key", "value")
- self.assertEquals(m.call_count, 1)
+ self.assertEqual(m.call_count, 1)
cache.pop("key")
- self.assertEquals(m.call_count, 1)
+ self.assertEqual(m.call_count, 1)
def test_del_multi(self):
m1 = Mock()
@@ -173,17 +173,17 @@ class LruCacheCallbacksTestCase(unittest.HomeserverTestCase):
cache.set(("b", "1"), "value", callbacks=[m3])
cache.set(("b", "2"), "value", callbacks=[m4])
- self.assertEquals(m1.call_count, 0)
- self.assertEquals(m2.call_count, 0)
- self.assertEquals(m3.call_count, 0)
- self.assertEquals(m4.call_count, 0)
+ self.assertEqual(m1.call_count, 0)
+ self.assertEqual(m2.call_count, 0)
+ self.assertEqual(m3.call_count, 0)
+ self.assertEqual(m4.call_count, 0)
cache.del_multi(("a",))
- self.assertEquals(m1.call_count, 1)
- self.assertEquals(m2.call_count, 1)
- self.assertEquals(m3.call_count, 0)
- self.assertEquals(m4.call_count, 0)
+ self.assertEqual(m1.call_count, 1)
+ self.assertEqual(m2.call_count, 1)
+ self.assertEqual(m3.call_count, 0)
+ self.assertEqual(m4.call_count, 0)
def test_clear(self):
m1 = Mock()
@@ -193,13 +193,13 @@ class LruCacheCallbacksTestCase(unittest.HomeserverTestCase):
cache.set("key1", "value", callbacks=[m1])
cache.set("key2", "value", callbacks=[m2])
- self.assertEquals(m1.call_count, 0)
- self.assertEquals(m2.call_count, 0)
+ self.assertEqual(m1.call_count, 0)
+ self.assertEqual(m2.call_count, 0)
cache.clear()
- self.assertEquals(m1.call_count, 1)
- self.assertEquals(m2.call_count, 1)
+ self.assertEqual(m1.call_count, 1)
+ self.assertEqual(m2.call_count, 1)
def test_eviction(self):
m1 = Mock(name="m1")
@@ -210,33 +210,33 @@ class LruCacheCallbacksTestCase(unittest.HomeserverTestCase):
cache.set("key1", "value", callbacks=[m1])
cache.set("key2", "value", callbacks=[m2])
- self.assertEquals(m1.call_count, 0)
- self.assertEquals(m2.call_count, 0)
- self.assertEquals(m3.call_count, 0)
+ self.assertEqual(m1.call_count, 0)
+ self.assertEqual(m2.call_count, 0)
+ self.assertEqual(m3.call_count, 0)
cache.set("key3", "value", callbacks=[m3])
- self.assertEquals(m1.call_count, 1)
- self.assertEquals(m2.call_count, 0)
- self.assertEquals(m3.call_count, 0)
+ self.assertEqual(m1.call_count, 1)
+ self.assertEqual(m2.call_count, 0)
+ self.assertEqual(m3.call_count, 0)
cache.set("key3", "value")
- self.assertEquals(m1.call_count, 1)
- self.assertEquals(m2.call_count, 0)
- self.assertEquals(m3.call_count, 0)
+ self.assertEqual(m1.call_count, 1)
+ self.assertEqual(m2.call_count, 0)
+ self.assertEqual(m3.call_count, 0)
cache.get("key2")
- self.assertEquals(m1.call_count, 1)
- self.assertEquals(m2.call_count, 0)
- self.assertEquals(m3.call_count, 0)
+ self.assertEqual(m1.call_count, 1)
+ self.assertEqual(m2.call_count, 0)
+ self.assertEqual(m3.call_count, 0)
cache.set("key1", "value", callbacks=[m1])
- self.assertEquals(m1.call_count, 1)
- self.assertEquals(m2.call_count, 0)
- self.assertEquals(m3.call_count, 1)
+ self.assertEqual(m1.call_count, 1)
+ self.assertEqual(m2.call_count, 0)
+ self.assertEqual(m3.call_count, 1)
class LruCacheSizedTestCase(unittest.HomeserverTestCase):
@@ -247,20 +247,20 @@ class LruCacheSizedTestCase(unittest.HomeserverTestCase):
cache["key3"] = [3]
cache["key4"] = [4]
- self.assertEquals(cache["key1"], [0])
- self.assertEquals(cache["key2"], [1, 2])
- self.assertEquals(cache["key3"], [3])
- self.assertEquals(cache["key4"], [4])
- self.assertEquals(len(cache), 5)
+ self.assertEqual(cache["key1"], [0])
+ self.assertEqual(cache["key2"], [1, 2])
+ self.assertEqual(cache["key3"], [3])
+ self.assertEqual(cache["key4"], [4])
+ self.assertEqual(len(cache), 5)
cache["key5"] = [5, 6]
- self.assertEquals(len(cache), 4)
- self.assertEquals(cache.get("key1"), None)
- self.assertEquals(cache.get("key2"), None)
- self.assertEquals(cache["key3"], [3])
- self.assertEquals(cache["key4"], [4])
- self.assertEquals(cache["key5"], [5, 6])
+ self.assertEqual(len(cache), 4)
+ self.assertEqual(cache.get("key1"), None)
+ self.assertEqual(cache.get("key2"), None)
+ self.assertEqual(cache["key3"], [3])
+ self.assertEqual(cache["key4"], [4])
+ self.assertEqual(cache["key5"], [5, 6])
def test_zero_size_drop_from_cache(self) -> None:
"""Test that `drop_from_cache` works correctly with 0-sized entries."""
diff --git a/tests/util/test_treecache.py b/tests/util/test_treecache.py
index 6066372053..567cb18468 100644
--- a/tests/util/test_treecache.py
+++ b/tests/util/test_treecache.py
@@ -23,61 +23,61 @@ class TreeCacheTestCase(unittest.TestCase):
cache = TreeCache()
cache[("a",)] = "A"
cache[("b",)] = "B"
- self.assertEquals(cache.get(("a",)), "A")
- self.assertEquals(cache.get(("b",)), "B")
- self.assertEquals(len(cache), 2)
+ self.assertEqual(cache.get(("a",)), "A")
+ self.assertEqual(cache.get(("b",)), "B")
+ self.assertEqual(len(cache), 2)
def test_pop_onelevel(self):
cache = TreeCache()
cache[("a",)] = "A"
cache[("b",)] = "B"
- self.assertEquals(cache.pop(("a",)), "A")
- self.assertEquals(cache.pop(("a",)), None)
- self.assertEquals(cache.get(("b",)), "B")
- self.assertEquals(len(cache), 1)
+ self.assertEqual(cache.pop(("a",)), "A")
+ self.assertEqual(cache.pop(("a",)), None)
+ self.assertEqual(cache.get(("b",)), "B")
+ self.assertEqual(len(cache), 1)
def test_get_set_twolevel(self):
cache = TreeCache()
cache[("a", "a")] = "AA"
cache[("a", "b")] = "AB"
cache[("b", "a")] = "BA"
- self.assertEquals(cache.get(("a", "a")), "AA")
- self.assertEquals(cache.get(("a", "b")), "AB")
- self.assertEquals(cache.get(("b", "a")), "BA")
- self.assertEquals(len(cache), 3)
+ self.assertEqual(cache.get(("a", "a")), "AA")
+ self.assertEqual(cache.get(("a", "b")), "AB")
+ self.assertEqual(cache.get(("b", "a")), "BA")
+ self.assertEqual(len(cache), 3)
def test_pop_twolevel(self):
cache = TreeCache()
cache[("a", "a")] = "AA"
cache[("a", "b")] = "AB"
cache[("b", "a")] = "BA"
- self.assertEquals(cache.pop(("a", "a")), "AA")
- self.assertEquals(cache.get(("a", "a")), None)
- self.assertEquals(cache.get(("a", "b")), "AB")
- self.assertEquals(cache.pop(("b", "a")), "BA")
- self.assertEquals(cache.pop(("b", "a")), None)
- self.assertEquals(len(cache), 1)
+ self.assertEqual(cache.pop(("a", "a")), "AA")
+ self.assertEqual(cache.get(("a", "a")), None)
+ self.assertEqual(cache.get(("a", "b")), "AB")
+ self.assertEqual(cache.pop(("b", "a")), "BA")
+ self.assertEqual(cache.pop(("b", "a")), None)
+ self.assertEqual(len(cache), 1)
def test_pop_mixedlevel(self):
cache = TreeCache()
cache[("a", "a")] = "AA"
cache[("a", "b")] = "AB"
cache[("b", "a")] = "BA"
- self.assertEquals(cache.get(("a", "a")), "AA")
+ self.assertEqual(cache.get(("a", "a")), "AA")
popped = cache.pop(("a",))
- self.assertEquals(cache.get(("a", "a")), None)
- self.assertEquals(cache.get(("a", "b")), None)
- self.assertEquals(cache.get(("b", "a")), "BA")
- self.assertEquals(len(cache), 1)
+ self.assertEqual(cache.get(("a", "a")), None)
+ self.assertEqual(cache.get(("a", "b")), None)
+ self.assertEqual(cache.get(("b", "a")), "BA")
+ self.assertEqual(len(cache), 1)
- self.assertEquals({"AA", "AB"}, set(iterate_tree_cache_entry(popped)))
+ self.assertEqual({"AA", "AB"}, set(iterate_tree_cache_entry(popped)))
def test_clear(self):
cache = TreeCache()
cache[("a",)] = "A"
cache[("b",)] = "B"
cache.clear()
- self.assertEquals(len(cache), 0)
+ self.assertEqual(len(cache), 0)
def test_contains(self):
cache = TreeCache()
|
