[Python-checkins] gh-105539: Fix ResourceWarning from unclosed SQLite connections in test_sqlite3 (#108360)
erlend-aasland
webhook-mailer at python.org
Wed Aug 23 06:10:11 EDT 2023
https://github.com/python/cpython/commit/29bc6165ab8aa434145a34676b8b7e48e7c6e308
commit: 29bc6165ab8aa434145a34676b8b7e48e7c6e308
branch: main
author: Mariusz Felisiak <felisiak.mariusz at gmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2023-08-23T10:10:08Z
summary:
gh-105539: Fix ResourceWarning from unclosed SQLite connections in test_sqlite3 (#108360)
Follow up to 1a1bfc28912a39b500c578e9f10a8a222638d411.
Explicitly manage connections in:
- test_audit.test_sqlite3
- test_sqlite3.test_audit
- test_sqlite3.test_backup
Co-authored-by: Erlend E. Aasland <erlend at python.org>
files:
M Lib/test/audit-tests.py
M Lib/test/test_sqlite3/test_backup.py
M Lib/test/test_sqlite3/test_dbapi.py
diff --git a/Lib/test/audit-tests.py b/Lib/test/audit-tests.py
index cc614eab90850..ad8f72f556331 100644
--- a/Lib/test/audit-tests.py
+++ b/Lib/test/audit-tests.py
@@ -398,15 +398,18 @@ def hook(event, *args):
cx2 = sqlite3.Connection(":memory:")
# Configured without --enable-loadable-sqlite-extensions
- if hasattr(sqlite3.Connection, "enable_load_extension"):
- cx1.enable_load_extension(False)
- try:
- cx1.load_extension("test")
- except sqlite3.OperationalError:
- pass
- else:
- raise RuntimeError("Expected sqlite3.load_extension to fail")
-
+ try:
+ if hasattr(sqlite3.Connection, "enable_load_extension"):
+ cx1.enable_load_extension(False)
+ try:
+ cx1.load_extension("test")
+ except sqlite3.OperationalError:
+ pass
+ else:
+ raise RuntimeError("Expected sqlite3.load_extension to fail")
+ finally:
+ cx1.close()
+ cx2.close()
def test_sys_getframe():
import sys
diff --git a/Lib/test/test_sqlite3/test_backup.py b/Lib/test/test_sqlite3/test_backup.py
index 4584d976bce0c..c7400d8b2165e 100644
--- a/Lib/test/test_sqlite3/test_backup.py
+++ b/Lib/test/test_sqlite3/test_backup.py
@@ -137,7 +137,7 @@ def progress(status, remaining, total):
raise SystemError('nearly out of space')
with self.assertRaises(SystemError) as err:
- with sqlite.connect(':memory:') as bck:
+ with memory_database() as bck:
self.cx.backup(bck, progress=progress)
self.assertEqual(str(err.exception), 'nearly out of space')
diff --git a/Lib/test/test_sqlite3/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py
index d80ad7af3200f..9dedbdbc4bb6d 100644
--- a/Lib/test/test_sqlite3/test_dbapi.py
+++ b/Lib/test/test_sqlite3/test_dbapi.py
@@ -40,6 +40,7 @@
from test.support.os_helper import TESTFN, TESTFN_UNDECODABLE, unlink, temp_dir, FakePath
from .util import memory_database, cx_limit
+from .util import MemoryDatabaseMixin
class ModuleTests(unittest.TestCase):
@@ -1740,10 +1741,9 @@ def test_closed_call(self):
self.check(self.con)
-class ClosedCurTests(unittest.TestCase):
+class ClosedCurTests(MemoryDatabaseMixin, unittest.TestCase):
def test_closed(self):
- con = sqlite.connect(":memory:")
- cur = con.cursor()
+ cur = self.cx.cursor()
cur.close()
for method_name in ("execute", "executemany", "executescript", "fetchall", "fetchmany", "fetchone"):
More information about the Python-checkins
mailing list