From 49f472810c68745da43710760bd8ff8c9ba8e590 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sat, 30 May 2020 20:16:52 +0200 Subject: [PATCH 1/6] Move test directory and rename files * git rm __init__.py * git mv Lib/sqlite3/test => Lib/test/test_sqlite3 * git mv test_sqlite3.py => __init__.py * add test_ prefix to test files --- Lib/sqlite3/test/__init__.py | 0 Lib/test/{test_sqlite.py => test_sqlite3/__init__.py} | 0 Lib/{sqlite3/test/backup.py => test/test_sqlite3/test_backup.py} | 0 Lib/{sqlite3/test/dbapi.py => test/test_sqlite3/test_dbapi.py} | 0 Lib/{sqlite3/test/dump.py => test/test_sqlite3/test_dump.py} | 0 .../test/factory.py => test/test_sqlite3/test_factory.py} | 0 Lib/{sqlite3/test/hooks.py => test/test_sqlite3/test_hooks.py} | 0 .../test/regression.py => test/test_sqlite3/test_regression.py} | 0 .../transactions.py => test/test_sqlite3/test_transactions.py} | 0 Lib/{sqlite3/test/types.py => test/test_sqlite3/test_types.py} | 0 .../userfunctions.py => test/test_sqlite3/test_userfunctions.py} | 0 11 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Lib/sqlite3/test/__init__.py rename Lib/test/{test_sqlite.py => test_sqlite3/__init__.py} (100%) rename Lib/{sqlite3/test/backup.py => test/test_sqlite3/test_backup.py} (100%) rename Lib/{sqlite3/test/dbapi.py => test/test_sqlite3/test_dbapi.py} (100%) rename Lib/{sqlite3/test/dump.py => test/test_sqlite3/test_dump.py} (100%) rename Lib/{sqlite3/test/factory.py => test/test_sqlite3/test_factory.py} (100%) rename Lib/{sqlite3/test/hooks.py => test/test_sqlite3/test_hooks.py} (100%) rename Lib/{sqlite3/test/regression.py => test/test_sqlite3/test_regression.py} (100%) rename Lib/{sqlite3/test/transactions.py => test/test_sqlite3/test_transactions.py} (100%) rename Lib/{sqlite3/test/types.py => test/test_sqlite3/test_types.py} (100%) rename Lib/{sqlite3/test/userfunctions.py => test/test_sqlite3/test_userfunctions.py} (100%) diff --git a/Lib/sqlite3/test/__init__.py b/Lib/sqlite3/test/__init__.py deleted file mode 100644 index e69de29bb2d1d6..00000000000000 diff --git a/Lib/test/test_sqlite.py b/Lib/test/test_sqlite3/__init__.py similarity index 100% rename from Lib/test/test_sqlite.py rename to Lib/test/test_sqlite3/__init__.py diff --git a/Lib/sqlite3/test/backup.py b/Lib/test/test_sqlite3/test_backup.py similarity index 100% rename from Lib/sqlite3/test/backup.py rename to Lib/test/test_sqlite3/test_backup.py diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py similarity index 100% rename from Lib/sqlite3/test/dbapi.py rename to Lib/test/test_sqlite3/test_dbapi.py diff --git a/Lib/sqlite3/test/dump.py b/Lib/test/test_sqlite3/test_dump.py similarity index 100% rename from Lib/sqlite3/test/dump.py rename to Lib/test/test_sqlite3/test_dump.py diff --git a/Lib/sqlite3/test/factory.py b/Lib/test/test_sqlite3/test_factory.py similarity index 100% rename from Lib/sqlite3/test/factory.py rename to Lib/test/test_sqlite3/test_factory.py diff --git a/Lib/sqlite3/test/hooks.py b/Lib/test/test_sqlite3/test_hooks.py similarity index 100% rename from Lib/sqlite3/test/hooks.py rename to Lib/test/test_sqlite3/test_hooks.py diff --git a/Lib/sqlite3/test/regression.py b/Lib/test/test_sqlite3/test_regression.py similarity index 100% rename from Lib/sqlite3/test/regression.py rename to Lib/test/test_sqlite3/test_regression.py diff --git a/Lib/sqlite3/test/transactions.py b/Lib/test/test_sqlite3/test_transactions.py similarity index 100% rename from Lib/sqlite3/test/transactions.py rename to Lib/test/test_sqlite3/test_transactions.py diff --git a/Lib/sqlite3/test/types.py b/Lib/test/test_sqlite3/test_types.py similarity index 100% rename from Lib/sqlite3/test/types.py rename to Lib/test/test_sqlite3/test_types.py diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/test/test_sqlite3/test_userfunctions.py similarity index 100% rename from Lib/sqlite3/test/userfunctions.py rename to Lib/test/test_sqlite3/test_userfunctions.py From d2c39637278fc134e487ec1bfb2d18ab3f218e57 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Tue, 2 Jun 2020 11:24:58 +0200 Subject: [PATCH 2/6] Add __main__.py --- Lib/test/test_sqlite3/__main__.py | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Lib/test/test_sqlite3/__main__.py diff --git a/Lib/test/test_sqlite3/__main__.py b/Lib/test/test_sqlite3/__main__.py new file mode 100644 index 00000000000000..a000e22ef6df80 --- /dev/null +++ b/Lib/test/test_sqlite3/__main__.py @@ -0,0 +1,4 @@ +from test.test_sqlite3 import load_tests +import unittest + +unittest.main() From 1d2f5eba6fd620129e025828ebbd7e7aa741431a Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sat, 30 May 2020 20:37:42 +0200 Subject: [PATCH 3/6] Automatically load tests instead of using a hard coded list --- Lib/test/test_sqlite3/__init__.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py index 73002f228fa70b..72f2ccd2cf2bed 100644 --- a/Lib/test/test_sqlite3/__init__.py +++ b/Lib/test/test_sqlite3/__init__.py @@ -4,23 +4,14 @@ # Skip test if _sqlite3 module not installed import_helper.import_module('_sqlite3') -import unittest +import os import sqlite3 -from sqlite3.test import (dbapi, types, userfunctions, - factory, transactions, hooks, regression, - dump, backup) def load_tests(*args): if test.support.verbose: - print("test_sqlite: testing with version", + print("test_sqlite3: testing with version", "{!r}, sqlite_version {!r}".format(sqlite3.version, sqlite3.sqlite_version)) - return unittest.TestSuite([dbapi.suite(), types.suite(), - userfunctions.suite(), - factory.suite(), transactions.suite(), - hooks.suite(), regression.suite(), - dump.suite(), - backup.suite()]) -if __name__ == "__main__": - unittest.main() + pkg_dir = os.path.dirname(__file__) + return test.support.load_package_tests(pkg_dir, *args) From f54874153d6c3b2121b7d93601c50055e1d3651b Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Tue, 2 Jun 2020 11:35:32 +0200 Subject: [PATCH 4/6] Autoload test suites instead of hard coding them --- Lib/test/test_sqlite3/test_backup.py | 3 --- Lib/test/test_sqlite3/test_dbapi.py | 22 +-------------------- Lib/test/test_sqlite3/test_dump.py | 13 +----------- Lib/test/test_sqlite3/test_factory.py | 18 +---------------- Lib/test/test_sqlite3/test_hooks.py | 16 +-------------- Lib/test/test_sqlite3/test_regression.py | 15 +------------- Lib/test/test_sqlite3/test_transactions.py | 15 +------------- Lib/test/test_sqlite3/test_types.py | 19 +----------------- Lib/test/test_sqlite3/test_userfunctions.py | 19 +----------------- 9 files changed, 8 insertions(+), 132 deletions(-) diff --git a/Lib/test/test_sqlite3/test_backup.py b/Lib/test/test_sqlite3/test_backup.py index ddff78c7607b27..7e82f1dfb98a41 100644 --- a/Lib/test/test_sqlite3/test_backup.py +++ b/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() diff --git a/Lib/test/test_sqlite3/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py index 68a30622395325..ed310f52fc8c3e 100644 --- a/Lib/test/test_sqlite3/test_dbapi.py +++ b/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() diff --git a/Lib/test/test_sqlite3/test_dump.py b/Lib/test/test_sqlite3/test_dump.py index 618a7fd31c1543..1f14c620f0d24b 100644 --- a/Lib/test/test_sqlite3/test_dump.py +++ b/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() diff --git a/Lib/test/test_sqlite3/test_factory.py b/Lib/test/test_sqlite3/test_factory.py index 876428497542f8..cf047b896b3726 100644 --- a/Lib/test/test_sqlite3/test_factory.py +++ b/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() diff --git a/Lib/test/test_sqlite3/test_hooks.py b/Lib/test/test_sqlite3/test_hooks.py index a219e8911f7063..ff013f47271581 100644 --- a/Lib/test/test_sqlite3/test_hooks.py +++ b/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() diff --git a/Lib/test/test_sqlite3/test_regression.py b/Lib/test/test_sqlite3/test_regression.py index c8e0b27564ad10..f371c2b6ac10b0 100644 --- a/Lib/test/test_sqlite3/test_regression.py +++ b/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() diff --git a/Lib/test/test_sqlite3/test_transactions.py b/Lib/test/test_sqlite3/test_transactions.py index 80284902a1a6e9..8ea352b9ef0f9b 100644 --- a/Lib/test/test_sqlite3/test_transactions.py +++ b/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() diff --git a/Lib/test/test_sqlite3/test_types.py b/Lib/test/test_sqlite3/test_types.py index 92ec6349f8bd2c..7a1fc6309e572a 100644 --- a/Lib/test/test_sqlite3/test_types.py +++ b/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() diff --git a/Lib/test/test_sqlite3/test_userfunctions.py b/Lib/test/test_sqlite3/test_userfunctions.py index 2285abd4fd8a57..c8d9167cb03e2c 100644 --- a/Lib/test/test_sqlite3/test_userfunctions.py +++ b/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() From a2599bb2652220e5b7395bc3fef94985ae5b70d7 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Thu, 7 Jan 2021 01:25:43 +0100 Subject: [PATCH 5/6] Add NEWS --- .../next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst diff --git a/Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst b/Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst new file mode 100644 index 00000000000000..45f44bcbb110b4 --- /dev/null +++ b/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. From fdc1ff21f187dd4d845f03221bd41e20f84bdb3f Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Thu, 7 Jan 2021 01:27:02 +0100 Subject: [PATCH 6/6] Update Makefile --- Makefile.pre.in | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index d8b9e8498d51bd..5371bd1195b0e8 100644 --- a/Makefile.pre.in +++ b/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 \