bpo-10572 : Move sqlite3 tests to Lib/test/test_sqlite3

Lib/test/test_sqlite3/__init__.py

@@ -0,0 +1,17 @@
+import test.support
+from test.support import import_helper
+
+# Skip test if _sqlite3 module not installed
+import_helper.import_module('_sqlite3')
+
+import os
+import sqlite3
+
+def load_tests(*args):
+    if test.support.verbose:
+        print("test_sqlite3: testing with version",
+              "{!r}, sqlite_version {!r}".format(sqlite3.version,
+                                                 sqlite3.sqlite_version))
+
+    pkg_dir = os.path.dirname(__file__)
+    return test.support.load_package_tests(pkg_dir, *args)

Lib/test/test_sqlite3/__main__.py

@@ -0,0 +1,4 @@
+from test.test_sqlite3 import load_tests
+import unittest
+
+unittest.main()

Lib/sqlite3/test/backup.py → Lib/test/test_sqlite3/test_backup.py

@@ -161,8 +161,5 @@ def test_database_source_name(self):
             self.verify_backup(bck)
 
 
-def suite():
-    return unittest.TestLoader().loadTestsFromTestCase(BackupTests)
-
 if __name__ == "__main__":
     unittest.main()

Lib/sqlite3/test/dbapi.py → Lib/test/test_sqlite3/test_dbapi.py

@@ -929,25 +929,5 @@ def test_on_conflict_replace(self):
         self.assertEqual(self.cu.fetchall(), [('Very different data!', 'foo')])
 
 
-def suite():
-    tests = [
-        ClosedConTests,
-        ClosedCurTests,
-        ConnectionTests,
-        ConstructorTests,
-        CursorTests,
-        ExtensionTests,
-        ModuleTests,
-        SqliteOnConflictTests,
-        ThreadTests,
-    ]
-    return unittest.TestSuite(
-        [unittest.TestLoader().loadTestsFromTestCase(t) for t in tests]
-    )
-
-def test():
-    runner = unittest.TextTestRunner()
-    runner.run(suite())
-
 if __name__ == "__main__":
-    test()
+    unittest.main()

Lib/sqlite3/test/dump.py → Lib/test/test_sqlite3/test_dump.py

@@ -70,17 +70,6 @@ def __getitem__(self, index):
         got = list(self.cx.iterdump())
         self.assertEqual(expected, got)
 
-def suite():
-    tests = [
-        DumpTests,
-    ]
-    return unittest.TestSuite(
-        [unittest.TestLoader().loadTestsFromTestCase(t) for t in tests]
-    )
-
-def test():
-    runner = unittest.TextTestRunner()
-    runner.run(suite())
 
 if __name__ == "__main__":
-    test()
+    unittest.main()

Lib/sqlite3/test/factory.py → Lib/test/test_sqlite3/test_factory.py

@@ -301,22 +301,6 @@ def test_custom(self):
     def tearDown(self):
         self.con.close()
 
-def suite():
-    tests = [
-        ConnectionFactoryTests,
-        CursorFactoryTests,
-        RowFactoryTests,
-        RowFactoryTestsBackwardsCompat,
-        TextFactoryTests,
-        TextFactoryTestsWithEmbeddedZeroBytes,
-    ]
-    return unittest.TestSuite(
-        [unittest.TestLoader().loadTestsFromTestCase(t) for t in tests]
-    )
-
-def test():
-    runner = unittest.TextTestRunner()
-    runner.run(suite())
 
 if __name__ == "__main__":
-    test()
+    unittest.main()

Lib/sqlite3/test/hooks.py → Lib/test/test_sqlite3/test_hooks.py

@@ -262,19 +262,5 @@ def trace(statement):
         self.assertEqual(traced_statements, queries)
 
 
-def suite():
-    tests = [
-        CollationTests,
-        ProgressTests,
-        TraceCallbackTests,
-    ]
-    return unittest.TestSuite(
-        [unittest.TestLoader().loadTestsFromTestCase(t) for t in tests]
-    )
-
-def test():
-    runner = unittest.TextTestRunner()
-    runner.run(suite())
-
 if __name__ == "__main__":
-    test()
+    unittest.main()

Lib/sqlite3/test/regression.py → Lib/test/test_sqlite3/test_regression.py

@@ -410,18 +410,5 @@ def log(self, *args):
             method(None)
 
 
-
-def suite():
-    tests = [
-        RegressionTests
-    ]
-    return unittest.TestSuite(
-        [unittest.TestLoader().loadTestsFromTestCase(t) for t in tests]
-    )
-
-def test():
-    runner = unittest.TextTestRunner()
-    runner.run(suite())
-
 if __name__ == "__main__":
-    test()
+    unittest.main()

Lib/sqlite3/test/transactions.py → Lib/test/test_sqlite3/test_transactions.py

@@ -195,19 +195,6 @@ def test_transactional_ddl(self):
     def tearDown(self):
         self.con.close()
 
-def suite():
-    tests = [
-        SpecialCommandTests,
-        TransactionTests,
-        TransactionalDDL,
-    ]
-    return unittest.TestSuite(
-        [unittest.TestLoader().loadTestsFromTestCase(t) for t in tests]
-    )
-
-def test():
-    runner = unittest.TextTestRunner()
-    runner.run(suite())
 
 if __name__ == "__main__":
-    test()
+    unittest.main()

Lib/sqlite3/test/types.py → Lib/test/test_sqlite3/test_types.py

@@ -422,23 +422,6 @@ def test_date_time_sub_seconds_floating_point(self):
         ts2 = self.cur.fetchone()[0]
         self.assertEqual(ts, ts2)
 
-def suite():
-    tests = [
-        BinaryConverterTests,
-        ColNamesTests,
-        CommonTableExpressionTests,
-        DateTimeTests,
-        DeclTypesTests,
-        ObjectAdaptationTests,
-        SqliteTypeTests,
-    ]
-    return unittest.TestSuite(
-        [unittest.TestLoader().loadTestsFromTestCase(t) for t in tests]
-    )
-
-def test():
-    runner = unittest.TextTestRunner()
-    runner.run(suite())
 
 if __name__ == "__main__":
-    test()
+    unittest.main()

Lib/sqlite3/test/userfunctions.py → Lib/test/test_sqlite3/test_userfunctions.py

@@ -493,22 +493,5 @@ def authorizer_cb(action, arg1, arg2, dbname, source):
         return sqlite.SQLITE_OK
 
 
-def suite():
-    tests = [
-        AggregateTests,
-        AuthorizerIllegalTypeTests,
-        AuthorizerLargeIntegerTests,
-        AuthorizerRaiseExceptionTests,
-        AuthorizerTests,
-        FunctionTests,
-    ]
-    return unittest.TestSuite(
-        [unittest.TestLoader().loadTestsFromTestCase(t) for t in tests]
-    )
-
-def test():
-    runner = unittest.TextTestRunner()
-    runner.run(suite())
-
 if __name__ == "__main__":
-    test()
+    unittest.main()

Makefile.pre.in

@@ -1404,7 +1404,6 @@ TESTSUBDIRS=	ctypes/test \
 		lib2to3/tests/data \
 		lib2to3/tests/data/fixers \
 		lib2to3/tests/data/fixers/myfixes \
-		sqlite3/test \
 		test test/audiodata \
 		test/capath test/cjkencodings \
 		test/data test/decimaltestdata \

Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst

@@ -0,0 +1,2 @@
+Move :mod:`sqlite3` tests to ``/Lib/test/test_sqlite3``. Patch by Erlend E.
+Aasland.