diff --git a/tests/util/caches/test_descriptors.py b/tests/util/caches/test_descriptors.py
index 463a737efa..6f8f52537c 100644
--- a/tests/util/caches/test_descriptors.py
+++ b/tests/util/caches/test_descriptors.py
@@ -88,24 +88,24 @@ class DescriptorTestCase(unittest.TestCase):
obj = Cls()
- obj.mock.return_value = 'fish'
+ obj.mock.return_value = "fish"
r = yield obj.fn(1, 2)
- self.assertEqual(r, 'fish')
+ self.assertEqual(r, "fish")
obj.mock.assert_called_once_with(1, 2)
obj.mock.reset_mock()
# a call with different params should call the mock again
- obj.mock.return_value = 'chips'
+ obj.mock.return_value = "chips"
r = yield obj.fn(1, 3)
- self.assertEqual(r, 'chips')
+ self.assertEqual(r, "chips")
obj.mock.assert_called_once_with(1, 3)
obj.mock.reset_mock()
# the two values should now be cached
r = yield obj.fn(1, 2)
- self.assertEqual(r, 'fish')
+ self.assertEqual(r, "fish")
r = yield obj.fn(1, 3)
- self.assertEqual(r, 'chips')
+ self.assertEqual(r, "chips")
obj.mock.assert_not_called()
@defer.inlineCallbacks
@@ -121,25 +121,25 @@ class DescriptorTestCase(unittest.TestCase):
return self.mock(arg1, arg2)
obj = Cls()
- obj.mock.return_value = 'fish'
+ obj.mock.return_value = "fish"
r = yield obj.fn(1, 2)
- self.assertEqual(r, 'fish')
+ self.assertEqual(r, "fish")
obj.mock.assert_called_once_with(1, 2)
obj.mock.reset_mock()
# a call with different params should call the mock again
- obj.mock.return_value = 'chips'
+ obj.mock.return_value = "chips"
r = yield obj.fn(2, 3)
- self.assertEqual(r, 'chips')
+ self.assertEqual(r, "chips")
obj.mock.assert_called_once_with(2, 3)
obj.mock.reset_mock()
# the two values should now be cached; we should be able to vary
# the second argument and still get the cached result.
r = yield obj.fn(1, 4)
- self.assertEqual(r, 'fish')
+ self.assertEqual(r, "fish")
r = yield obj.fn(2, 5)
- self.assertEqual(r, 'chips')
+ self.assertEqual(r, "chips")
obj.mock.assert_not_called()
def test_cache_logcontexts(self):
@@ -248,30 +248,30 @@ class DescriptorTestCase(unittest.TestCase):
obj = Cls()
- obj.mock.return_value = 'fish'
+ obj.mock.return_value = "fish"
r = yield obj.fn(1, 2, 3)
- self.assertEqual(r, 'fish')
+ self.assertEqual(r, "fish")
obj.mock.assert_called_once_with(1, 2, 3)
obj.mock.reset_mock()
# a call with same params shouldn't call the mock again
r = yield obj.fn(1, 2)
- self.assertEqual(r, 'fish')
+ self.assertEqual(r, "fish")
obj.mock.assert_not_called()
obj.mock.reset_mock()
# a call with different params should call the mock again
- obj.mock.return_value = 'chips'
+ obj.mock.return_value = "chips"
r = yield obj.fn(2, 3)
- self.assertEqual(r, 'chips')
+ self.assertEqual(r, "chips")
obj.mock.assert_called_once_with(2, 3, 3)
obj.mock.reset_mock()
# the two values should now be cached
r = yield obj.fn(1, 2)
- self.assertEqual(r, 'fish')
+ self.assertEqual(r, "fish")
r = yield obj.fn(2, 3)
- self.assertEqual(r, 'chips')
+ self.assertEqual(r, "chips")
obj.mock.assert_not_called()
@@ -297,7 +297,7 @@ class CachedListDescriptorTestCase(unittest.TestCase):
with logcontext.LoggingContext() as c1:
c1.request = "c1"
obj = Cls()
- obj.mock.return_value = {10: 'fish', 20: 'chips'}
+ obj.mock.return_value = {10: "fish", 20: "chips"}
d1 = obj.list_fn([10, 20], 2)
self.assertEqual(
logcontext.LoggingContext.current_context(),
@@ -306,26 +306,26 @@ class CachedListDescriptorTestCase(unittest.TestCase):
r = yield d1
self.assertEqual(logcontext.LoggingContext.current_context(), c1)
obj.mock.assert_called_once_with([10, 20], 2)
- self.assertEqual(r, {10: 'fish', 20: 'chips'})
+ self.assertEqual(r, {10: "fish", 20: "chips"})
obj.mock.reset_mock()
# a call with different params should call the mock again
- obj.mock.return_value = {30: 'peas'}
+ obj.mock.return_value = {30: "peas"}
r = yield obj.list_fn([20, 30], 2)
obj.mock.assert_called_once_with([30], 2)
- self.assertEqual(r, {20: 'chips', 30: 'peas'})
+ self.assertEqual(r, {20: "chips", 30: "peas"})
obj.mock.reset_mock()
# all the values should now be cached
r = yield obj.fn(10, 2)
- self.assertEqual(r, 'fish')
+ self.assertEqual(r, "fish")
r = yield obj.fn(20, 2)
- self.assertEqual(r, 'chips')
+ self.assertEqual(r, "chips")
r = yield obj.fn(30, 2)
- self.assertEqual(r, 'peas')
+ self.assertEqual(r, "peas")
r = yield obj.list_fn([10, 20, 30], 2)
obj.mock.assert_not_called()
- self.assertEqual(r, {10: 'fish', 20: 'chips', 30: 'peas'})
+ self.assertEqual(r, {10: "fish", 20: "chips", 30: "peas"})
@defer.inlineCallbacks
def test_invalidate(self):
@@ -350,16 +350,16 @@ class CachedListDescriptorTestCase(unittest.TestCase):
invalidate1 = mock.Mock()
# cache miss
- obj.mock.return_value = {10: 'fish', 20: 'chips'}
+ obj.mock.return_value = {10: "fish", 20: "chips"}
r1 = yield obj.list_fn([10, 20], 2, on_invalidate=invalidate0)
obj.mock.assert_called_once_with([10, 20], 2)
- self.assertEqual(r1, {10: 'fish', 20: 'chips'})
+ self.assertEqual(r1, {10: "fish", 20: "chips"})
obj.mock.reset_mock()
# cache hit
r2 = yield obj.list_fn([10, 20], 2, on_invalidate=invalidate1)
obj.mock.assert_not_called()
- self.assertEqual(r2, {10: 'fish', 20: 'chips'})
+ self.assertEqual(r2, {10: "fish", 20: "chips"})
invalidate0.assert_not_called()
invalidate1.assert_not_called()
|
