Skip to content

Commit 82f8996

Browse files
committed
Refs django#5133 -- Isolated test_close() cache test.
1 parent 3c447b1 commit 82f8996

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

tests/cache/tests.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
DEFAULT_CACHE_ALIAS, CacheKeyWarning, cache, caches,
2222
)
2323
from django.core.cache.utils import make_template_fragment_key
24-
from django.db import connection, connections
24+
from django.db import close_old_connections, connection, connections
2525
from django.http import (
2626
HttpRequest, HttpResponse, HttpResponseNotModified, StreamingHttpResponse,
2727
)
@@ -1248,9 +1248,13 @@ def test_memcached_deletes_key_on_failed_set(self):
12481248
def test_close(self):
12491249
# For clients that don't manage their connections properly, the
12501250
# connection is closed when the request is complete.
1251-
with mock.patch.object(cache._lib.Client, 'disconnect_all', autospec=True) as mock_disconnect:
1252-
signals.request_finished.send(self.__class__)
1253-
self.assertIs(mock_disconnect.called, self.should_disconnect_on_close)
1251+
signals.request_finished.disconnect(close_old_connections)
1252+
try:
1253+
with mock.patch.object(cache._lib.Client, 'disconnect_all', autospec=True) as mock_disconnect:
1254+
signals.request_finished.send(self.__class__)
1255+
self.assertIs(mock_disconnect.called, self.should_disconnect_on_close)
1256+
finally:
1257+
signals.request_finished.connect(close_old_connections)
12541258

12551259

12561260
@unittest.skipUnless(MemcachedCache_params, "MemcachedCache backend not configured")

0 commit comments

Comments
 (0)