From de0bc5a01c3ddb972d37c280c99c98b53e63475c Mon Sep 17 00:00:00 2001 From: Erlend Egeberg Aasland Date: Tue, 14 Jun 2022 16:02:52 +0200 Subject: [PATCH] [3.10] gh-93795: Use test.support TESTFN/unlink in sqlite3 tests (GH-93796). (cherry picked from commit d773c6e95a1675d0d34ddc57290d624b982b7158) Co-authored-by: Erlend Egeberg Aasland --- Lib/sqlite3/test/transactions.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/Lib/sqlite3/test/transactions.py b/Lib/sqlite3/test/transactions.py index 80284902a1a6e9..4ebc7fbc785a90 100644 --- a/Lib/sqlite3/test/transactions.py +++ b/Lib/sqlite3/test/transactions.py @@ -23,33 +23,31 @@ import os, unittest import sqlite3 as sqlite -def get_db_path(): - return "sqlite_testdb" +from test.support import LOOPBACK_TIMEOUT +from test.support.os_helper import TESTFN, unlink + + +TIMEOUT = LOOPBACK_TIMEOUT / 10 + class TransactionTests(unittest.TestCase): def setUp(self): - try: - os.remove(get_db_path()) - except OSError: - pass - - self.con1 = sqlite.connect(get_db_path(), timeout=0.1) + self.con1 = sqlite.connect(TESTFN, timeout=TIMEOUT) self.cur1 = self.con1.cursor() - self.con2 = sqlite.connect(get_db_path(), timeout=0.1) + self.con2 = sqlite.connect(TESTFN, timeout=TIMEOUT) self.cur2 = self.con2.cursor() def tearDown(self): - self.cur1.close() - self.con1.close() + try: + self.cur1.close() + self.con1.close() - self.cur2.close() - self.con2.close() + self.cur2.close() + self.con2.close() - try: - os.unlink(get_db_path()) - except OSError: - pass + finally: + unlink(TESTFN) def test_dml_does_not_auto_commit_before(self): self.cur1.execute("create table test(i)")