From 0a32778c0c160a2bce11fac6855947b973cf8ec2 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Tue, 26 Oct 2021 10:36:24 +0200 Subject: [PATCH 01/18] Reorganise files deleted Lib/sqlite3/test/__init__.py renamed /test/test_sqlite.py -> Lib/test/test_sqlite3/__init__.py renamed /sqlite3/test/test_backup.py -> Lib/test/test_sqlite3/test_backup.py renamed /sqlite3/test/test_dbapi.py -> Lib/test/test_sqlite3/test_dbapi.py renamed /sqlite3/test/test_dump.py -> Lib/test/test_sqlite3/test_dump.py renamed /sqlite3/test/test_factory.py -> Lib/test/test_sqlite3/test_factory.py renamed /sqlite3/test/test_hooks.py -> Lib/test/test_sqlite3/test_hooks.py renamed /sqlite3/test/test_regression.py -> Lib/test/test_sqlite3/test_regression.py renamed /sqlite3/test/test_transactions.py -> Lib/test/test_sqlite3/test_transactions.py renamed /sqlite3/test/test_types.py -> Lib/test/test_sqlite3/test_types.py renamed /sqlite3/test/test_userfunctions.py -> Lib/test/test_sqlite3/test_userfunctions.py --- Lib/sqlite3/test/__init__.py | 0 Lib/test/{test_sqlite.py => test_sqlite3/__init__.py} | 0 Lib/{sqlite3/test => test/test_sqlite3}/test_backup.py | 0 Lib/{sqlite3/test => test/test_sqlite3}/test_dbapi.py | 0 Lib/{sqlite3/test => test/test_sqlite3}/test_dump.py | 0 Lib/{sqlite3/test => test/test_sqlite3}/test_factory.py | 0 Lib/{sqlite3/test => test/test_sqlite3}/test_hooks.py | 0 Lib/{sqlite3/test => test/test_sqlite3}/test_regression.py | 0 Lib/{sqlite3/test => test/test_sqlite3}/test_transactions.py | 0 Lib/{sqlite3/test => test/test_sqlite3}/test_types.py | 0 Lib/{sqlite3/test => 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 => test/test_sqlite3}/test_backup.py (100%) rename Lib/{sqlite3/test => test/test_sqlite3}/test_dbapi.py (100%) rename Lib/{sqlite3/test => test/test_sqlite3}/test_dump.py (100%) rename Lib/{sqlite3/test => test/test_sqlite3}/test_factory.py (100%) rename Lib/{sqlite3/test => test/test_sqlite3}/test_hooks.py (100%) rename Lib/{sqlite3/test => test/test_sqlite3}/test_regression.py (100%) rename Lib/{sqlite3/test => test/test_sqlite3}/test_transactions.py (100%) rename Lib/{sqlite3/test => test/test_sqlite3}/test_types.py (100%) rename Lib/{sqlite3/test => 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/test_backup.py b/Lib/test/test_sqlite3/test_backup.py similarity index 100% rename from Lib/sqlite3/test/test_backup.py rename to Lib/test/test_sqlite3/test_backup.py diff --git a/Lib/sqlite3/test/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py similarity index 100% rename from Lib/sqlite3/test/test_dbapi.py rename to Lib/test/test_sqlite3/test_dbapi.py diff --git a/Lib/sqlite3/test/test_dump.py b/Lib/test/test_sqlite3/test_dump.py similarity index 100% rename from Lib/sqlite3/test/test_dump.py rename to Lib/test/test_sqlite3/test_dump.py diff --git a/Lib/sqlite3/test/test_factory.py b/Lib/test/test_sqlite3/test_factory.py similarity index 100% rename from Lib/sqlite3/test/test_factory.py rename to Lib/test/test_sqlite3/test_factory.py diff --git a/Lib/sqlite3/test/test_hooks.py b/Lib/test/test_sqlite3/test_hooks.py similarity index 100% rename from Lib/sqlite3/test/test_hooks.py rename to Lib/test/test_sqlite3/test_hooks.py diff --git a/Lib/sqlite3/test/test_regression.py b/Lib/test/test_sqlite3/test_regression.py similarity index 100% rename from Lib/sqlite3/test/test_regression.py rename to Lib/test/test_sqlite3/test_regression.py diff --git a/Lib/sqlite3/test/test_transactions.py b/Lib/test/test_sqlite3/test_transactions.py similarity index 100% rename from Lib/sqlite3/test/test_transactions.py rename to Lib/test/test_sqlite3/test_transactions.py diff --git a/Lib/sqlite3/test/test_types.py b/Lib/test/test_sqlite3/test_types.py similarity index 100% rename from Lib/sqlite3/test/test_types.py rename to Lib/test/test_sqlite3/test_types.py diff --git a/Lib/sqlite3/test/test_userfunctions.py b/Lib/test/test_sqlite3/test_userfunctions.py similarity index 100% rename from Lib/sqlite3/test/test_userfunctions.py rename to Lib/test/test_sqlite3/test_userfunctions.py From 1333aa91b468846cb25caedf1c90d2e7f5130508 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Tue, 26 Oct 2021 10:41:50 +0200 Subject: [PATCH 02/18] Fixup Lib/test/test_sqlite3/__init__.py --- Lib/test/test_sqlite3/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py index 9992a02e5d90a0..57a091baa2f7d0 100644 --- a/Lib/test/test_sqlite3/__init__.py +++ b/Lib/test/test_sqlite3/__init__.py @@ -7,14 +7,15 @@ import unittest import os -import sqlite3.test +import sqlite3 def load_tests(loader, tests, pattern): if test.support.verbose: print("test_sqlite: testing with version", "{!r}, sqlite_version {!r}".format(sqlite3.version, sqlite3.sqlite_version)) - return load_package_tests(os.path.dirname(sqlite3.test.__file__), loader, tests, pattern) + pkg_dir = os.path.dirname(__file__) + return load_package_tests(pkg_dir, loader, tests, pattern) if __name__ == "__main__": unittest.main() From f5f1bde93e8a36adc5109e099bcc306691f20d37 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Thu, 7 Jan 2021 01:25:43 +0100 Subject: [PATCH 03/18] 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 195709a71b47a9edd322f7fd69346460861467d1 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Thu, 7 Jan 2021 01:27:02 +0100 Subject: [PATCH 04/18] Update Makefile --- Makefile.pre.in | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 60acc16beeee3f..604243f8135bae 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1553,7 +1553,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 \ From 571a51573639ab51ca23fcad4ee2d406c58b1de5 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Tue, 26 Oct 2021 12:23:24 +0200 Subject: [PATCH 05/18] Fix inter-test includes --- Lib/test/test_sqlite3/test_hooks.py | 2 +- Lib/test/test_sqlite3/test_regression.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_sqlite3/test_hooks.py b/Lib/test/test_sqlite3/test_hooks.py index bf454b2aa887f3..f9477f2e236611 100644 --- a/Lib/test/test_sqlite3/test_hooks.py +++ b/Lib/test/test_sqlite3/test_hooks.py @@ -24,7 +24,7 @@ import sqlite3 as sqlite from test.support.os_helper import TESTFN, unlink -from .test_userfunctions import with_tracebacks +from test_userfunctions import with_tracebacks class CollationTests(unittest.TestCase): def test_create_collation_not_string(self): diff --git a/Lib/test/test_sqlite3/test_regression.py b/Lib/test/test_sqlite3/test_regression.py index 3d71809d9c11cf..d9cbe975ebde36 100644 --- a/Lib/test/test_sqlite3/test_regression.py +++ b/Lib/test/test_sqlite3/test_regression.py @@ -28,7 +28,7 @@ import functools from test import support -from .test_dbapi import managed_connect +from test_dbapi import managed_connect class RegressionTests(unittest.TestCase): def setUp(self): From 351dcae36e8f2497e12f4e646dc07671190ca02e Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 29 Oct 2021 10:43:31 +0200 Subject: [PATCH 06/18] Fixup PCbuild --- PCbuild/lib.pyproj | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj index 06e0a8b0d1c537..43c570f1dab37a 100644 --- a/PCbuild/lib.pyproj +++ b/PCbuild/lib.pyproj @@ -1272,7 +1272,17 @@ - + + + + + + + + + + + From f8889d21136ea1f534b9633b395a81ce46876e8f Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 29 Oct 2021 10:44:06 +0200 Subject: [PATCH 07/18] Revert 571a51573639ab51ca23fcad4ee2d406c58b1de5 --- Lib/test/test_sqlite3/test_hooks.py | 2 +- Lib/test/test_sqlite3/test_regression.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_sqlite3/test_hooks.py b/Lib/test/test_sqlite3/test_hooks.py index f9477f2e236611..bf454b2aa887f3 100644 --- a/Lib/test/test_sqlite3/test_hooks.py +++ b/Lib/test/test_sqlite3/test_hooks.py @@ -24,7 +24,7 @@ import sqlite3 as sqlite from test.support.os_helper import TESTFN, unlink -from test_userfunctions import with_tracebacks +from .test_userfunctions import with_tracebacks class CollationTests(unittest.TestCase): def test_create_collation_not_string(self): diff --git a/Lib/test/test_sqlite3/test_regression.py b/Lib/test/test_sqlite3/test_regression.py index d9cbe975ebde36..3d71809d9c11cf 100644 --- a/Lib/test/test_sqlite3/test_regression.py +++ b/Lib/test/test_sqlite3/test_regression.py @@ -28,7 +28,7 @@ import functools from test import support -from test_dbapi import managed_connect +from .test_dbapi import managed_connect class RegressionTests(unittest.TestCase): def setUp(self): From b6f50d99de8c37e1d8cc42d16f6f24d376fd8c3f Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 29 Oct 2021 10:49:39 +0200 Subject: [PATCH 08/18] Allow ./python -m test.test_sqlite3 --- 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 cbb18a9e0737114b767d0e86df00dd0376d8402a Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 29 Oct 2021 10:53:31 +0200 Subject: [PATCH 09/18] Fixup __init__.py debug message --- Lib/test/test_sqlite3/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py index 57a091baa2f7d0..96c582fac1eaa1 100644 --- a/Lib/test/test_sqlite3/__init__.py +++ b/Lib/test/test_sqlite3/__init__.py @@ -11,7 +11,7 @@ def load_tests(loader, tests, pattern): 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)) pkg_dir = os.path.dirname(__file__) From 7f2ee3b38637c342482c9c126a22663f16b48eb9 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 29 Oct 2021 11:05:36 +0200 Subject: [PATCH 10/18] Simplify __init__ --- Lib/test/test_sqlite3/__init__.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py index 96c582fac1eaa1..6da17745e4d106 100644 --- a/Lib/test/test_sqlite3/__init__.py +++ b/Lib/test/test_sqlite3/__init__.py @@ -9,13 +9,14 @@ import os import sqlite3 -def load_tests(loader, tests, pattern): - if test.support.verbose: - print("test_sqlite3: testing with version", - "{!r}, sqlite_version {!r}".format(sqlite3.version, - sqlite3.sqlite_version)) +def load_tests(*args): pkg_dir = os.path.dirname(__file__) - return load_package_tests(pkg_dir, loader, tests, pattern) + return load_package_tests(pkg_dir, *args) + +if test.support.verbose: + print("test_sqlite3: testing with version", + "{!r}, sqlite_version {!r}".format(sqlite3.version, + sqlite3.sqlite_version)) if __name__ == "__main__": unittest.main() From bca9a72dda8601224e023e7d0c1f18990714a5a4 Mon Sep 17 00:00:00 2001 From: Erlend Egeberg Aasland Date: Fri, 29 Oct 2021 22:20:18 +0200 Subject: [PATCH 11/18] Update Lib/test/test_sqlite3/__main__.py Co-authored-by: Brett Cannon --- Lib/test/test_sqlite3/__main__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_sqlite3/__main__.py b/Lib/test/test_sqlite3/__main__.py index a000e22ef6df80..9122423561dfc3 100644 --- a/Lib/test/test_sqlite3/__main__.py +++ b/Lib/test/test_sqlite3/__main__.py @@ -1,4 +1,5 @@ from test.test_sqlite3 import load_tests import unittest -unittest.main() +if __name__ == "__main__": + unittest.main() From 35f6334d727af34ed29cadb5aa928360172e9d09 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 29 Oct 2021 22:38:19 +0200 Subject: [PATCH 12/18] Address review: remove useless import --- Lib/test/test_sqlite3/__main__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Lib/test/test_sqlite3/__main__.py b/Lib/test/test_sqlite3/__main__.py index 9122423561dfc3..fba0404ae17908 100644 --- a/Lib/test/test_sqlite3/__main__.py +++ b/Lib/test/test_sqlite3/__main__.py @@ -1,4 +1,3 @@ -from test.test_sqlite3 import load_tests import unittest if __name__ == "__main__": From 52b9164bd53a009188635fde66eb9bfa003cadef Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 29 Oct 2021 22:45:08 +0200 Subject: [PATCH 13/18] Revert "Address review: remove useless import" This reverts commit 35f6334 and adds a comment on why it was needed --- Lib/test/test_sqlite3/__main__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_sqlite3/__main__.py b/Lib/test/test_sqlite3/__main__.py index fba0404ae17908..eb7117e4bb314c 100644 --- a/Lib/test/test_sqlite3/__main__.py +++ b/Lib/test/test_sqlite3/__main__.py @@ -1,3 +1,4 @@ +from test.test_sqlite3 import load_tests # needed for the load_tests protocol import unittest if __name__ == "__main__": From 5d5e84fcfef0a6f5e05787925ee04819d4b27a1a Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 29 Oct 2021 22:57:42 +0200 Subject: [PATCH 14/18] Address review: remove uneeded 'if __name__ == "__main__"' --- Lib/test/test_sqlite3/__init__.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py index 6da17745e4d106..1036b5a7b257a2 100644 --- a/Lib/test/test_sqlite3/__init__.py +++ b/Lib/test/test_sqlite3/__init__.py @@ -17,6 +17,3 @@ def load_tests(*args): print("test_sqlite3: testing with version", "{!r}, sqlite_version {!r}".format(sqlite3.version, sqlite3.sqlite_version)) - -if __name__ == "__main__": - unittest.main() From 75fe05b804f319ea43b57751f513ed525bef9268 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 29 Oct 2021 23:08:08 +0200 Subject: [PATCH 15/18] Add comment and clean up __init__ --- Lib/test/test_sqlite3/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py index 1036b5a7b257a2..9edf51ccebf822 100644 --- a/Lib/test/test_sqlite3/__init__.py +++ b/Lib/test/test_sqlite3/__init__.py @@ -1,6 +1,4 @@ -import test.support -from test.support import import_helper -from test.support import load_package_tests +from test.support import import_helper, load_package_tests, verbose # Skip test if _sqlite3 module not installed import_helper.import_module('_sqlite3') @@ -9,11 +7,12 @@ import os import sqlite3 +# Implement the unittest "load tests" protocol def load_tests(*args): pkg_dir = os.path.dirname(__file__) return load_package_tests(pkg_dir, *args) -if test.support.verbose: +if verbose: print("test_sqlite3: testing with version", "{!r}, sqlite_version {!r}".format(sqlite3.version, sqlite3.sqlite_version)) From 76b85333ff341ff54b12c94c55e9fec8cb599325 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 29 Oct 2021 14:44:52 -0700 Subject: [PATCH 16/18] Add a period --- Lib/test/test_sqlite3/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py index 9edf51ccebf822..ec423a6be9a95c 100644 --- a/Lib/test/test_sqlite3/__init__.py +++ b/Lib/test/test_sqlite3/__init__.py @@ -1,6 +1,6 @@ from test.support import import_helper, load_package_tests, verbose -# Skip test if _sqlite3 module not installed +# Skip test if _sqlite3 module not installed. import_helper.import_module('_sqlite3') import unittest From 200d2fc48ed718df051a62eee4331151eb21f6d0 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 29 Oct 2021 14:45:01 -0700 Subject: [PATCH 17/18] Add a period --- Lib/test/test_sqlite3/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py index ec423a6be9a95c..099c01e3b3cc70 100644 --- a/Lib/test/test_sqlite3/__init__.py +++ b/Lib/test/test_sqlite3/__init__.py @@ -7,7 +7,7 @@ import os import sqlite3 -# Implement the unittest "load tests" protocol +# Implement the unittest "load tests" protocol. def load_tests(*args): pkg_dir = os.path.dirname(__file__) return load_package_tests(pkg_dir, *args) From f0b13ebfb67f206e7185281af6f243b2486471ec Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 29 Oct 2021 14:45:10 -0700 Subject: [PATCH 18/18] Add a period --- Lib/test/test_sqlite3/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_sqlite3/__main__.py b/Lib/test/test_sqlite3/__main__.py index eb7117e4bb314c..51eddc3c2fde02 100644 --- a/Lib/test/test_sqlite3/__main__.py +++ b/Lib/test/test_sqlite3/__main__.py @@ -1,4 +1,4 @@ -from test.test_sqlite3 import load_tests # needed for the load_tests protocol +from test.test_sqlite3 import load_tests # Needed for the "load tests" protocol. import unittest if __name__ == "__main__":