8000 gh-95065: Argument Clinic: Add functional tests of deprecated positionals by erlend-aasland · Pull Request #107768 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-95065: Argument Clinic: Add functional tests of deprecated positionals #107768

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
merged 16 commits into from
Aug 10, 2023
Merged

gh-95065: Argument Clinic: Add functional tests of deprecated positionals #107768

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
803f991
gh-95065: Argument Clinic: Add functional tests of deprecated positio…
erlend-aasland Aug 8, 2023
a28c62e
Fix tests
erlend-aasland Aug 8, 2023
61bef45
Readable tests
erlend-aasland Aug 8, 2023
daea15e
Pull in main
erlend-aasland Aug 8, 2023
00a7562
Pull in main
erlend-aasland Aug 9, 2023
6559443
Address review: greatly simplify tests
erlend-aasland Aug 9, 2023
194420b
More accurate regex; pass param names explicitly
erlend-aasland Aug 9, 2023
6875b2f
Even nicer
erlend-aasland Aug 9, 2023
181cbf7
Merge branch 'main' into clinic/better-depr-tests
erlend-aasland Aug 9, 2023
9f40557
Update Lib/test/test_clinic.py
erlend-aasland Aug 9, 2023
2e3cdfc
Also test __new__ and __init__
erlend-aasland Aug 9, 2023
cdf0574
Check the line number
erlend-aasland Aug 9, 2023
91c122a
Pull in main
erlend-aasland Aug 9, 2023
9a4128d
Update globals-to-fix.tsv
erlend-aasland Aug 9, 2023
e56888c
Apply suggestions from code review
erlend-aasland Aug 10, 2023
44aac33
Merge branch 'main' into clinic/better-depr-tests
erlend-aasland Aug 10, 2023
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: greatly simplify tests
  • Loading branch information
@erlend-aasland
erlend-aasland committed Aug 9, 2023
commit 6559443c7b028fb309d800006f42cb3ce1f123ac
140 changes: 41 additions & 99 deletions Lib/test/test_clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2423,19 +2423,15 @@ class ClinicFunctionalTest(unittest.TestCase):
locals().update((name, getattr(ac_tester, name))
for name in dir(ac_tester) if name.startswith('test_'))

def check_depr_star(self, *, fname, pnames, good_calls, bad_calls):
for call in good_calls:
call()
def check_depr_star(self, fn, *args, **kwds):
pnames = ".*".join([repr(a) for a in args])
regex = (
f"Passing.*positional argument.*to {fname}.*is deprecated. "
f"Parameter.*{pnames} will become.*keyword-only parameter.*in "
"Python 3.14"
f"Passing.*positional argument.*to {fn.__name__}.*is deprecated. "
f"Parameter.*{pnames} will become.*keyword-only parameter.*in Python 3.14"
)
for call in bad_calls:
with self.assertWarnsRegex(DeprecationWarning, regex) as cm:
call()
self.assertTrue(cm.filename.endswith("test_clinic.py"), cm.filename)
call() # No warning raised second time
with self.assertWarnsRegex(DeprecationWarning, regex) as cm:
fn(*args, **kwds)
self.assertEqual(cm.filename, __file__)

def test_objects_converter(self):
with self.assertRaises(TypeError):
Expand Down Expand Up @@ -2903,118 +2899,64 @@ def test_cloned_func_with_converter_exception_message( 10000 self):

def test_depr_star_pos0_len1(self):
fn = ac_tester.depr_star_pos0_len1
self.check_depr_star(
fname="depr_star_pos0_len1", pnames="'a'",
good_calls=[
lambda: fn(a=None),
],
bad_calls=[
lambda: fn(None),
])
fn(a=None)
self.check_depr_star(fn, "a")

def test_depr_star_pos0_len2(self):
fn = ac_tester.depr_star_pos0_len2
self.check_depr_star(
fname="depr_star_pos0_len2", pnames="'a' and 'b'",
good_calls=[
lambda: fn(a=None, b=None),
],
bad_calls=[
lambda: fn(None, b=None),
lambda: fn(None, None),
])
fn(a=0, b=0),
self.check_depr_star(fn, "a", b=0),
self.check_depr_star(fn, "a", "b"),

def test_depr_star_pos0_len3_with_kwd(self):
fn = ac_tester.depr_star_pos0_len3_with_kwd
self.check_depr_star(
fname="depr_star_pos0_len3_with_kwd", pnames="'a', 'b' and 'c'",
good_calls=[
lambda: fn(a=None, b=None, c=None, d=None),
],
bad_calls=[
lambda: fn(None, b=None, c=None, d=None),
lambda: fn(None, None, c=None, d=None),
lambda: fn(None, None, None, d=None),
])
fn(a=0, b=0, c=0, d=0)
self.check_depr_star(fn, "a", b=0, c=0, d=0)
self.check_depr_star(fn, "a", "b", c=0, d=0)
self.check_depr_star(fn, "a", "b", "c", d=0)

def test_depr_star_pos1_len1_opt(self):
fn = ac_tester.depr_star_pos1_len1_opt
self.check_depr_star(
fname="depr_star_pos1_len1_opt", pnames="'b'",
good_calls=[
lambda: fn(a=None, b=None),
lambda: fn(None, b=None),
lambda: fn(a=None),
],
bad_calls=[
lambda: fn(None, None),
])
fn(a=0, b=0)
fn("a", b=0)
fn(a=0) # b is optional
self.check_depr_star(fn, "a", "b")

def test_depr_star_pos1_len1(self):
fn = ac_tester.depr_star_pos1_len1
self.check_depr_star(
fname="depr_star_pos1_len1", pnames="'b'",
good_calls=[
lambda: fn(a=None, b=None),
lambda: fn(None, b=None),
],
bad_calls=[
lambda: fn(None, None),
])
fn(a=0, b=0)
fn("a", b=0)
self.check_depr_star(fn, "a", "b")

def test_depr_star_pos1_len2_with_kwd(self):
fn = ac_tester.depr_star_pos1_len2_with_kwd
self.check_depr_star(
fname="depr_star_pos1_len2_with_kwd", pnames="'b' and 'c'",
good_calls=[
lambda: fn(a=None, b=None, c=None, d=None),
lambda: fn(None, b=None, c=None, d=None),
],
bad_calls=[
lambda: fn(None, None, c=None, d=None),
lambda: fn(None, None, None, d=None),
])
fn(a=0, b=0, c=0, d=0),
fn("a", b=0, c=0, d=0),
self.check_depr_star(fn, "a", "b", c=0, d=0),
self.check_depr_star(fn, "a", "b", "c", d=0),

def test_depr_star_pos2_len1(self):
fn = ac_tester.depr_star_pos2_len1
self.check_depr_star(
fname="depr_star_pos2_len1", pnames="'c'",
good_calls=[
lambda: fn(a=None, b=None, c=None),
lambda: fn(None, b=None, c=None),
lambda: fn(None, None, c=None),
],
bad_calls=[
lambda: fn(None, None, None),
])
fn(a=0, b=0, c=0)
fn("a", b=0, c=0)
fn("a", "b", c=0)
self.check_depr_star(fn, "a", "b", "c")

def test_depr_star_pos2_len2(self):
fn = ac_tester.depr_star_pos2_len2
self.check_depr_star(
fname="depr_star_pos2_len2", pnames="'c' and 'd'",
good_calls=[
lambda: fn(a=None, b=None, c=None, d=None),
lambda: fn(None, b=None, c=None, d=None),
lambda: fn(None, None, c=None, d=None),
],
bad_calls=[
lambda: fn(None, None, None, d=None),
lambda: fn(None, None, None, None),
])
fn(a=0, b=0, c=0, d=0)
fn("a", b=0, c=0, d=0)
fn("a", "b", c=0, d=0)
self.check_depr_star(fn, "a", "b", "c", d=0)
self.check_depr_star(fn, "a", "b", "c", "d")

def test_depr_star_pos2_len2_with_kwd(self):
fn = ac_tester.depr_star_pos2_len2_with_kwd
self.check_depr_star(
fname="depr_star_pos2_len2", pnames="'c' and 'd'",
good_calls=[
lambda: fn(a=None, b=None, c=None, d=None, e=None),
lambda: fn(None, b=None, c=None, d=None, e=None),
lambda: fn(None, None, c=None, d=None, e=None),
],
bad_calls=[
lambda: fn(None, None, None, d=None, e=None),
lambda: fn(None, None, None, None, e=None),
])
fn(a=0, b=0, c=0, d=0, e=0)
fn("a", b=0, c=0, d=0, e=0)
fn("a", "b", c=0, d=0, e=0)
self.check_depr_star(fn, "a", "b", "c", d=0, e=0)
self.check_depr_star(fn, "a", "b", "c", "d", e=0)


class PermutationTests(unittest.TestCase):
Expand Down
0