From 76990cbbda5d93fda560c8a5ab019860f7efaab7 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Thu, 14 Feb 2019 07:04:55 -0800 Subject: Fixed #30171 -- Fixed DatabaseError in servers tests. Made DatabaseWrapper thread sharing logic reentrant. Used a reference counting like scheme to allow nested uses. The error appeared after 8c775391b78b2a4a2b57c5e89ed4888f36aada4b. --- tests/servers/test_liveserverthread.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/servers') diff --git a/tests/servers/test_liveserverthread.py b/tests/servers/test_liveserverthread.py index d39aac8183..9762b53791 100644 --- a/tests/servers/test_liveserverthread.py +++ b/tests/servers/test_liveserverthread.py @@ -18,11 +18,10 @@ class LiveServerThreadTest(TestCase): # Pass a connection to the thread to check they are being closed. connections_override = {DEFAULT_DB_ALIAS: conn} - saved_sharing = conn.allow_thread_sharing + conn.inc_thread_sharing() try: - conn.allow_thread_sharing = True self.assertTrue(conn.is_usable()) self.run_live_server_thread(connections_override) self.assertFalse(conn.is_usable()) finally: - conn.allow_thread_sharing = saved_sharing + conn.dec_thread_sharing() -- cgit v1.3