Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-10572: Move sqlite3 tests to Lib/test #29304

Merged
merged 18 commits into from
Oct 29, 2021
Merged

bpo-10572: Move sqlite3 tests to Lib/test #29304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0a32778
Reorganise files
Oct 26, 2021
1333aa9
Fixup Lib/test/test_sqlite3/__init__.py
Oct 26, 2021
f5f1bde
Add NEWS
Jan 7, 2021
195709a
Update Makefile
Jan 7, 2021
571a515
Fix inter-test includes
Oct 26, 2021
351dcae
Fixup PCbuild
Oct 29, 2021
f8889d2
Revert 571a51573639ab51ca23fcad4ee2d406c58b1de5
Oct 29, 2021
b6f50d9
Allow ./python -m test.test_sqlite3
Oct 29, 2021
cbb18a9
Fixup __init__.py debug message
Oct 29, 2021
7f2ee3b
Simplify __init__
Oct 29, 2021
bca9a72
Update Lib/test/test_sqlite3/__main__.py
Oct 29, 2021
35f6334
Address review: remove useless import
Oct 29, 2021
52b9164
Revert "Address review: remove useless import"
Oct 29, 2021
5d5e84f
Address review: remove uneeded 'if __name__ == "__main__"'
Oct 29, 2021
75fe05b
Add comment and clean up __init__
Oct 29, 2021
76b8533
Add a period
brettcannon Oct 29, 2021
200d2fc
Add a period
brettcannon Oct 29, 2021
f0b13eb
Add a period
brettcannon Oct 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed Lib/sqlite3/test/__init__.py
View file
Open in desktop
Empty file.
20 changes: 0 additions & 20 deletions Lib/test/test_sqlite.py
View file
Open in desktop

This file was deleted.

18 changes: 18 additions & 0 deletions Lib/test/test_sqlite3/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
from test.support import import_helper, load_package_tests, verbose

# Skip test if _sqlite3 module not installed.
import_helper.import_module('_sqlite3')

import unittest
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 verbose:
print("test_sqlite3: testing with version",
"{!r}, sqlite_version {!r}".format(sqlite3.version,
sqlite3.sqlite_version))
5 changes: 5 additions & 0 deletions Lib/test/test_sqlite3/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from test.test_sqlite3 import load_tests # Needed for the "load tests" protocol.
import unittest

if __name__ == "__main__":
unittest.main()
0 Lib/sqlite3/test/test_backup.py → Lib/test/test_sqlite3/test_backup.py
View file
Open in desktop
File renamed without changes.
0 Lib/sqlite3/test/test_dbapi.py → Lib/test/test_sqlite3/test_dbapi.py
View file
Open in desktop
File renamed without changes.
0 Lib/sqlite3/test/test_dump.py → Lib/test/test_sqlite3/test_dump.py
View file
Open in desktop
File renamed without changes.
0 Lib/sqlite3/test/test_factory.py → Lib/test/test_sqlite3/test_factory.py
View file
Open in desktop
File renamed without changes.
0 Lib/sqlite3/test/test_hooks.py → Lib/test/test_sqlite3/test_hooks.py
View file
Open in desktop
File renamed without changes.
0 Lib/sqlite3/test/test_regression.py → Lib/test/test_sqlite3/test_regression.py
View file
Open in desktop
File renamed without changes.
0 Lib/sqlite3/test/test_transactions.py → Lib/test/test_sqlite3/test_transactions.py
View file
Open in desktop
File renamed without changes.
0 Lib/sqlite3/test/test_types.py → Lib/test/test_sqlite3/test_types.py
View file
Open in desktop
File renamed without changes.
0 Lib/sqlite3/test/test_userfunctions.py → Lib/test/test_sqlite3/test_userfunctions.py
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Move :mod:`sqlite3` tests to ``/Lib/test/test_sqlite3``. Patch by Erlend E.
Aasland.
12 changes: 11 additions & 1 deletion PCbuild/lib.pyproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,17 @@
<Compile Include="test\test_sort.py" />
<Compile Include="test\test_source_encoding.py" />
<Compile Include="test\test_spwd.py" />
<Compile Include="test\test_sqlite.py" />
<Compile Include="test\test_sqlite3" />
<Compile Include="test\test_sqlite3\__init__.py" />
<Compile Include="test\test_sqlite3\test_backup.py" />
<Compile Include="test\test_sqlite3\test_dbapi.py" />
<Compile Include="test\test_sqlite3\test_dump.py" />
<Compile Include="test\test_sqlite3\test_factory.py" />
<Compile Include="test\test_sqlite3\test_hooks.py" />
<Compile Include="test\test_sqlite3\test_regression.py" />
<Compile Include="test\test_sqlite3\test_transactions.py" />
<Compile Include="test\test_sqlite3\test_types.py" />
<Compile Include="test\test_sqlite3\test_userfunctions.py" />
<Compile Include="test\test_ssl.py" />
<Compile Include="test\test_startfile.py" />
<Compile Include="test\test_stat.py" />
Expand Down