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
  • Loading branch information
Erlend E. Aasland committed Nov 2, 2021
commit cb5624974e5567900eb2d6fa20d66e53ac733d21
7 changes: 5 additions & 2 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 @@ -542,9 +542,12 @@ def __getitem__(slf, x):
def test_execute_too_many_params(self):
category = sqlite.SQLITE_LIMIT_VARIABLE_NUMBER
msg = "too many SQL variables"
with cx_limit(self.cx, category=category, limit=1):
with cx_limit(self.cx, category=category, limit=2):
self.cu.execute("select * from test where name=? and income=?",
("a", 1))
with self.assertRaisesRegex(sqlite.OperationalError, msg):
self.cu.execute("insert into test values(?, ?)", (1, 2))
self.cu.execute("insert into test values(?, ?, ?)",
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
("a", 2, "b"))

def test_execute_dict_mapping(self):
self.cu.execute("insert into test(name) values ('foo')")
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_sqlite3/test_userfunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ def test_func_too_many_args(self):
msg = "too many arguments on function"
with cx_limit(self.con, category=category, limit=1):
with self.assertRaisesRegex(sqlite.OperationalError, msg):
self.con.create_function("toomany", 2, lambda: "")
self.con.execute("select toomany(1, 2)");
self.con.create_function("addint", 2, lambda x, y: x+y)
self.con.execute("select addint(1, 2)");

def test_func_ref_count(self):
def getfunc():
Expand Down