Skip to content

bpo-45243: Use connection limits to simplify sqlite3 tests #29356

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

Merged
serhiy-storchaka merged 13 commits into from
Nov 5, 2021
Merged

bpo-45243: Use connection limits to simplify sqlite3 tests #29356

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8cdb980
bpo-45243: Use sqlite3 connection limit context manager in test suite
Nov 2, 2021
d68d6d8
Add test for too many SQL variables
Nov 2, 2021
22adb06
Adjust comment
Nov 2, 2021
cb56249
Address review
Nov 2, 2021
3a75c2d
Address review: test lim-1 and lim
Nov 4, 2021
a6da634
Address review: make it clear which function is failing
Nov 4, 2021
3f1ee2a
Merge remote-tracking branch 'upstream/main' into sqlite-use-limits-i…
Nov 4, 2021
b98d623
Update Lib/test/test_sqlite3/test_dbapi.py
Nov 5, 2021
9521fc1
Simplify test_func_too_many_args further
Nov 5, 2021
c53ffd7
Add single-argument test
Nov 5, 2021
6197b3a
Simplify sql statements in test_execute_too_many_params
Nov 5, 2021
032bfd5
Use abs iso. round
Nov 5, 2021
c257c65
Make sure we test against correct limit in test_execute_too_many_params
Nov 5, 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
Prev Previous commit
Next Next commit
Address review: test lim-1 and lim
  • Loading branch information
Erlend E. Aasland
Erlend E. Aasland committed Nov 4, 2021
commit 3a75c2db2ef04f64dce62483e0a9e8d6d27018d2
9 changes: 3 additions & 6 deletions Lib/test/test_sqlite3/test_dbapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,12 +938,9 @@ def test_cursor_executescript_with_surrogates(self):
def test_cursor_executescript_too_large_script(self):
msg = "query string is too large"
with memory_database() as cx, cx_limit(cx) as lim:
for sz in lim, lim+1:
with self.subTest(sz=sz):
self.assertRaisesRegex(
sqlite.DataError, msg, cx.executescript,
"create table a(s);".ljust(sz)
)
cx.executescript("select 'almost too large'".ljust(lim-1))
with self.assertRaisesRegex(sqlite.DataError, msg):
cx.executescript("select 'too large'".ljust(lim))

def test_cursor_executescript_tx_control(self):
con = sqlite.connect(":memory:")
Expand Down
16 changes: 9 additions & 7 deletions Lib/test/test_sqlite3/test_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,13 +360,15 @@ def test_surrogates(self):
def test_large_sql(self):
msg = "query string is too large"
with memory_database() as cx, cx_limit(cx) as lim:
for sz in lim, lim+1:
with self.subTest(sz=sz):
sql = "select 1".ljust(sz)
self.assertRaisesRegex(sqlite.DataError, msg, cx, sql)
cu = cx.cursor()
self.assertRaisesRegex(sqlite.DataError, msg,
cu.execute, sql)
cu = cx.cursor()

cx("select 1".ljust(lim-1))
# use a different SQL statement; don't reuse from the LRU cache
cu.execute("select 2".ljust(lim-1))

sql = "select 3".ljust(lim)
self.assertRaisesRegex(sqlite.DataError, msg, cx, sql)
self.assertRaisesRegex(sqlite.DataError, msg, cu.execute, sql)

def test_commit_cursor_reset(self):
"""
Expand Down