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_sqlite.py deleted file mode 100644 index 73002f228fa70b..00000000000000 --- a/Lib/test/test_sqlite.py +++ /dev/null @@ -1,26 +0,0 @@ -import test.support -from test.support import import_helper - -# Skip test if _sqlite3 module not installed -import_helper.import_module('_sqlite3') - -import unittest -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", - "{!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() diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py new file mode 100644 index 00000000000000..72f2ccd2cf2bed --- /dev/null +++ b/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) 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() diff --git a/Lib/sqlite3/test/backup.py b/Lib/test/test_sqlite3/test_backup.py similarity index 98% rename from Lib/sqlite3/test/backup.py rename to Lib/test/test_sqlite3/test_backup.py index ddff78c7607b27..7e82f1dfb98a41 100644 --- a/Lib/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/sqlite3/test/dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py similarity index 98% rename from Lib/sqlite3/test/dbapi.py rename to Lib/test/test_sqlite3/test_dbapi.py index 68a30622395325..ed310f52fc8c3e 100644 --- a/Lib/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/sqlite3/test/dump.py b/Lib/test/test_sqlite3/test_dump.py similarity index 91% rename from Lib/sqlite3/test/dump.py rename to Lib/test/test_sqlite3/test_dump.py index 618a7fd31c1543..1f14c620f0d24b 100644 --- a/Lib/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/sqlite3/test/factory.py b/Lib/test/test_sqlite3/test_factory.py similarity index 96% rename from Lib/sqlite3/test/factory.py rename to Lib/test/test_sqlite3/test_factory.py index 876428497542f8..cf047b896b3726 100644 --- a/Lib/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/sqlite3/test/hooks.py b/Lib/test/test_sqlite3/test_hooks.py similarity index 96% rename from Lib/sqlite3/test/hooks.py rename to Lib/test/test_sqlite3/test_hooks.py index a219e8911f7063..ff013f47271581 100644 --- a/Lib/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/sqlite3/test/regression.py b/Lib/test/test_sqlite3/test_regression.py similarity index 98% rename from Lib/sqlite3/test/regression.py rename to Lib/test/test_sqlite3/test_regression.py index c8e0b27564ad10..f371c2b6ac10b0 100644 --- a/Lib/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/sqlite3/test/transactions.py b/Lib/test/test_sqlite3/test_transactions.py similarity index 95% rename from Lib/sqlite3/test/transactions.py rename to Lib/test/test_sqlite3/test_transactions.py index 80284902a1a6e9..8ea352b9ef0f9b 100644 --- a/Lib/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/sqlite3/test/types.py b/Lib/test/test_sqlite3/test_types.py similarity index 97% rename from Lib/sqlite3/test/types.py rename to Lib/test/test_sqlite3/test_types.py index 92ec6349f8bd2c..7a1fc6309e572a 100644 --- a/Lib/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/sqlite3/test/userfunctions.py b/Lib/test/test_sqlite3/test_userfunctions.py similarity index 97% rename from Lib/sqlite3/test/userfunctions.py rename to Lib/test/test_sqlite3/test_userfunctions.py index 2285abd4fd8a57..c8d9167cb03e2c 100644 --- a/Lib/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() 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 \ 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.