Revert gc workarounds

Reverts commits:
- 866e226.
- 5ff1a80.
- 1e3f589.
- 6cb435b.

Author: Erlend E. Aasland

Lib/sqlite3/test/dbapi.py

@@ -25,7 +25,6 @@
 import sqlite3 as sqlite
 import sys
 
-from test.support import gc_collect
 from test.support.os_helper import TESTFN, unlink
 
 
@@ -171,16 +170,10 @@ def test_in_transaction_ro(self):
         with self.assertRaises(AttributeError):
             self.cx.in_transaction = True
 
-
-class OpenTests(unittest.TestCase):
-    def tearDown(self):
-        # bpo-42213: ensure that TESTFN is closed before unlinking
-        gc_collect()
-        unlink(TESTFN)
-
     def test_open_with_path_like_object(self):
         """ Checks that we can successfully connect to a database using an object that
             is PathLike, i.e. has __fspath__(). """
+        self.addCleanup(unlink, TESTFN)
         class Path:
             def __fspath__(self):
                 return TESTFN
@@ -189,6 +182,7 @@ def __fspath__(self):
             cx.execute('create table test(id integer)')
 
     def test_open_uri(self):
+        self.addCleanup(unlink, TESTFN)
         with sqlite.connect(TESTFN) as cx:
             cx.execute('create table test(id integer)')
         with sqlite.connect('file:' + TESTFN, uri=True) as cx:
@@ -948,7 +942,6 @@ def suite():
         CursorTests,
         ExtensionTests,
         ModuleTests,
-        OpenTests,
         SqliteOnConflictTests,
         ThreadTests,
     ]

Lib/sqlite3/test/hooks.py

@@ -23,7 +23,6 @@
 import unittest
 import sqlite3 as sqlite
 
-from test.support import gc_collect
 from test.support.os_helper import TESTFN, unlink
 
 
@@ -262,11 +261,6 @@ def trace(statement):
         cur.execute(queries[1])
         self.assertEqual(traced_statements, queries)
 
-        # bpo-42213: ensure that TESTFN is closed before the cleanup runs
-        con1.close()
-        con2.close()
-        gc_collect()
-
 
 def suite():
     tests = [