Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
d1c5e278
Commit
d1c5e278
authored
Aug 06, 2018
by
Serhiy Storchaka
Committed by
GitHub
Aug 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[2.7] bpo-34272: Move argument parsing tests from test_capi to test_getargs2. (GH-8567). (GH-8691)
(cherry picked from commit
8f7bb100
)
parent
7e4ff979
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
147 additions
and
140 deletions
+147
-140
Lib/test/test_capi.py
Lib/test/test_capi.py
+8
-133
Lib/test/test_getargs2.py
Lib/test/test_getargs2.py
+139
-7
No files found.
Lib/test/test_capi.py
View file @
d1c5e278
...
...
@@ -116,127 +116,6 @@ class TestGetIndices(unittest.TestCase):
self
.
assertEqual
(
_testcapi
.
get_indices
(
slice
(
10
,
20.1
,
1L
),
100
),
None
)
class
SkipitemTest
(
unittest
.
TestCase
):
def
test_skipitem
(
self
):
"""
If this test failed, you probably added a new "format unit"
in Python/getargs.c, but neglected to update our poor friend
skipitem() in the same file. (If so, shame on you!)
With a few exceptions**, this function brute-force tests all
printable ASCII*** characters (32 to 126 inclusive) as format units,
checking to see that PyArg_ParseTupleAndKeywords() return consistent
errors both when the unit is attempted to be used and when it is
skipped. If the format unit doesn't exist, we'll get one of two
specific error messages (one for used, one for skipped); if it does
exist we *won't* get that error--we'll get either no error or some
other error. If we get the specific "does not exist" error for one
test and not for the other, there's a mismatch, and the test fails.
** Some format units have special funny semantics and it would
be difficult to accommodate them here. Since these are all
well-established and properly skipped in skipitem() we can
get away with not testing them--this test is really intended
to catch *new* format units.
*** Python C source files must be ASCII. Therefore it's impossible
to have non-ASCII format units.
"""
empty_tuple
=
()
tuple_1
=
(
0
,)
dict_b
=
{
'b'
:
1
}
keywords
=
[
"a"
,
"b"
]
for
i
in
range
(
32
,
127
):
c
=
chr
(
i
)
# skip parentheses, the error reporting is inconsistent about them
# skip 'e', it's always a two-character code
# skip '|', it doesn't represent arguments anyway
if
c
in
'()e|'
:
continue
# test the format unit when not skipped
format
=
c
+
"i"
try
:
_testcapi
.
parse_tuple_and_keywords
(
tuple_1
,
dict_b
,
format
,
keywords
)
when_not_skipped
=
False
except
TypeError
as
e
:
s
=
"argument 1 (impossible<bad format char>)"
when_not_skipped
=
(
str
(
e
)
==
s
)
except
RuntimeError
:
when_not_skipped
=
False
# test the format unit when skipped
optional_format
=
"|"
+
format
try
:
_testcapi
.
parse_tuple_and_keywords
(
empty_tuple
,
dict_b
,
optional_format
,
keywords
)
when_skipped
=
False
except
RuntimeError
as
e
:
s
=
"impossible<bad format char>: '{}'"
.
format
(
format
)
when_skipped
=
(
str
(
e
)
==
s
)
message
=
(
"test_skipitem_parity: "
"detected mismatch between convertsimple and skipitem "
"for format unit '{}' ({}), not skipped {}, skipped {}"
.
format
(
c
,
i
,
when_skipped
,
when_not_skipped
))
self
.
assertIs
(
when_skipped
,
when_not_skipped
,
message
)
def
test_skipitem_with_suffix
(
self
):
parse
=
_testcapi
.
parse_tuple_and_keywords
empty_tuple
=
()
tuple_1
=
(
0
,)
dict_b
=
{
'b'
:
1
}
keywords
=
[
"a"
,
"b"
]
supported
=
(
's#'
,
's*'
,
'z#'
,
'z*'
,
'u#'
,
't#'
,
'w#'
,
'w*'
)
for
c
in
string
.
ascii_letters
:
for
c2
in
'#*'
:
f
=
c
+
c2
optional_format
=
"|"
+
f
+
"i"
if
f
in
supported
:
parse
(
empty_tuple
,
dict_b
,
optional_format
,
keywords
)
else
:
with
self
.
assertRaisesRegexp
((
RuntimeError
,
TypeError
),
'impossible<bad format char>'
):
parse
(
empty_tuple
,
dict_b
,
optional_format
,
keywords
)
for
c
in
map
(
chr
,
range
(
32
,
128
)):
f
=
'e'
+
c
optional_format
=
"|"
+
f
+
"i"
if
c
in
'st'
:
parse
(
empty_tuple
,
dict_b
,
optional_format
,
keywords
)
else
:
with
self
.
assertRaisesRegexp
(
RuntimeError
,
'impossible<bad format char>'
):
parse
(
empty_tuple
,
dict_b
,
optional_format
,
keywords
)
def
test_parse_tuple_and_keywords
(
self
):
# Test handling errors in the parse_tuple_and_keywords helper itself
self
.
assertRaises
(
TypeError
,
_testcapi
.
parse_tuple_and_keywords
,
(),
{},
42
,
[])
self
.
assertRaises
(
ValueError
,
_testcapi
.
parse_tuple_and_keywords
,
(),
{},
''
,
42
)
self
.
assertRaises
(
ValueError
,
_testcapi
.
parse_tuple_and_keywords
,
(),
{},
''
,
[
''
]
*
42
)
self
.
assertRaises
(
TypeError
,
_testcapi
.
parse_tuple_and_keywords
,
(),
{},
''
,
[
42
])
def
test_bad_use
(
self
):
# Test handling invalid format and keywords in
# PyArg_ParseTupleAndKeywords()
self
.
assertRaises
(
TypeError
,
_testcapi
.
parse_tuple_and_keywords
,
(
1
,),
{},
'||O'
,
[
'a'
])
self
.
assertRaises
(
RuntimeError
,
_testcapi
.
parse_tuple_and_keywords
,
(
1
,),
{},
'|O'
,
[
'a'
,
'b'
])
self
.
assertRaises
(
RuntimeError
,
_testcapi
.
parse_tuple_and_keywords
,
(
1
,),
{},
'|OO'
,
[
'a'
])
@
unittest
.
skipUnless
(
threading
and
thread
,
'Threading required for this test.'
)
class
TestThreadState
(
unittest
.
TestCase
):
...
...
@@ -262,19 +141,15 @@ class TestThreadState(unittest.TestCase):
t
.
join
()
def
test_main
():
for
name
in
dir
(
_testcapi
):
if
name
.
startswith
(
'test_'
):
test
=
getattr
(
_testcapi
,
name
)
if
support
.
verbose
:
print
"internal"
,
name
try
:
test
()
except
_testcapi
.
error
:
raise
support
.
TestFailed
,
sys
.
exc_info
()[
1
]
class
Test_testcapi
(
unittest
.
TestCase
):
locals
().
update
((
name
,
getattr
(
_testcapi
,
name
))
for
name
in
dir
(
_testcapi
)
if
name
.
startswith
(
'test_'
)
and
not
name
.
endswith
(
'_code'
))
support
.
run_unittest
(
CAPITest
,
TestPendingCalls
,
SkipitemTest
,
TestThreadState
,
TestGetIndices
)
def
test_main
():
support
.
run_unittest
(
CAPITest
,
TestPendingCalls
,
TestThreadState
,
TestGetIndices
,
Test_testcapi
)
if
__name__
==
"__main__"
:
test_main
()
Lib/test/test_getargs2.py
View file @
d1c5e278
import
unittest
import
math
import
string
import
sys
from
test
import
test_support
# Skip this test if the _testcapi module isn't available.
test_support
.
import_module
(
'_testcapi'
)
_testcapi
=
test_support
.
import_module
(
'_testcapi'
)
from
_testcapi
import
getargs_keywords
import
warnings
...
...
@@ -799,12 +800,6 @@ class Unicode_TestCase(unittest.TestCase):
self
.
assertRaises
(
TypeError
,
getargs_u_hash
,
None
)
def
test_main
():
tests
=
[
Signed_TestCase
,
Unsigned_TestCase
,
LongLong_TestCase
,
Tuple_TestCase
,
Keywords_TestCase
,
Bytes_TestCase
,
String_TestCase
,
Unicode_TestCase
]
test_support
.
run_unittest
(
*
tests
)
class
Object_TestCase
(
unittest
.
TestCase
):
def
test_S
(
self
):
from
_testcapi
import
getargs_S
...
...
@@ -840,5 +835,142 @@ class Object_TestCase(unittest.TestCase):
self
.
assertRaises
(
TypeError
,
getargs_U
,
buffer
(
obj
))
class
SkipitemTest
(
unittest
.
TestCase
):
def
test_skipitem
(
self
):
"""
If this test failed, you probably added a new "format unit"
in Python/getargs.c, but neglected to update our poor friend
skipitem() in the same file. (If so, shame on you!)
With a few exceptions**, this function brute-force tests all
printable ASCII*** characters (32 to 126 inclusive) as format units,
checking to see that PyArg_ParseTupleAndKeywords() return consistent
errors both when the unit is attempted to be used and when it is
skipped. If the format unit doesn't exist, we'll get one of two
specific error messages (one for used, one for skipped); if it does
exist we *won't* get that error--we'll get either no error or some
other error. If we get the specific "does not exist" error for one
test and not for the other, there's a mismatch, and the test fails.
** Some format units have special funny semantics and it would
be difficult to accommodate them here. Since these are all
well-established and properly skipped in skipitem() we can
get away with not testing them--this test is really intended
to catch *new* format units.
*** Python C source files must be ASCII. Therefore it's impossible
to have non-ASCII format units.
"""
empty_tuple
=
()
tuple_1
=
(
0
,)
dict_b
=
{
'b'
:
1
}
keywords
=
[
"a"
,
"b"
]
for
i
in
range
(
32
,
127
):
c
=
chr
(
i
)
# skip parentheses, the error reporting is inconsistent about them
# skip 'e', it's always a two-character code
# skip '|', it doesn't represent arguments anyway
if
c
in
'()e|'
:
continue
# test the format unit when not skipped
format
=
c
+
"i"
try
:
_testcapi
.
parse_tuple_and_keywords
(
tuple_1
,
dict_b
,
format
,
keywords
)
when_not_skipped
=
False
except
TypeError
as
e
:
s
=
"argument 1 (impossible<bad format char>)"
when_not_skipped
=
(
str
(
e
)
==
s
)
except
RuntimeError
:
when_not_skipped
=
False
# test the format unit when skipped
optional_format
=
"|"
+
format
try
:
_testcapi
.
parse_tuple_and_keywords
(
empty_tuple
,
dict_b
,
optional_format
,
keywords
)
when_skipped
=
False
except
RuntimeError
as
e
:
s
=
"impossible<bad format char>: '{}'"
.
format
(
format
)
when_skipped
=
(
str
(
e
)
==
s
)
message
=
(
"test_skipitem_parity: "
"detected mismatch between convertsimple and skipitem "
"for format unit '{}' ({}), not skipped {}, skipped {}"
.
format
(
c
,
i
,
when_skipped
,
when_not_skipped
))
self
.
assertIs
(
when_skipped
,
when_not_skipped
,
message
)
def
test_skipitem_with_suffix
(
self
):
parse
=
_testcapi
.
parse_tuple_and_keywords
empty_tuple
=
()
tuple_1
=
(
0
,)
dict_b
=
{
'b'
:
1
}
keywords
=
[
"a"
,
"b"
]
supported
=
(
's#'
,
's*'
,
'z#'
,
'z*'
,
'u#'
,
't#'
,
'w#'
,
'w*'
)
for
c
in
string
.
ascii_letters
:
for
c2
in
'#*'
:
f
=
c
+
c2
optional_format
=
"|"
+
f
+
"i"
if
f
in
supported
:
parse
(
empty_tuple
,
dict_b
,
optional_format
,
keywords
)
else
:
with
self
.
assertRaisesRegexp
((
RuntimeError
,
TypeError
),
'impossible<bad format char>'
):
parse
(
empty_tuple
,
dict_b
,
optional_format
,
keywords
)
for
c
in
map
(
chr
,
range
(
32
,
128
)):
f
=
'e'
+
c
optional_format
=
"|"
+
f
+
"i"
if
c
in
'st'
:
parse
(
empty_tuple
,
dict_b
,
optional_format
,
keywords
)
else
:
with
self
.
assertRaisesRegexp
(
RuntimeError
,
'impossible<bad format char>'
):
parse
(
empty_tuple
,
dict_b
,
optional_format
,
keywords
)
class
ParseTupleAndKeywords_Test
(
unittest
.
TestCase
):
def
test_parse_tuple_and_keywords
(
self
):
# Test handling errors in the parse_tuple_and_keywords helper itself
self
.
assertRaises
(
TypeError
,
_testcapi
.
parse_tuple_and_keywords
,
(),
{},
42
,
[])
self
.
assertRaises
(
ValueError
,
_testcapi
.
parse_tuple_and_keywords
,
(),
{},
''
,
42
)
self
.
assertRaises
(
ValueError
,
_testcapi
.
parse_tuple_and_keywords
,
(),
{},
''
,
[
''
]
*
42
)
self
.
assertRaises
(
TypeError
,
_testcapi
.
parse_tuple_and_keywords
,
(),
{},
''
,
[
42
])
def
test_bad_use
(
self
):
# Test handling invalid format and keywords in
# PyArg_ParseTupleAndKeywords()
self
.
assertRaises
(
TypeError
,
_testcapi
.
parse_tuple_and_keywords
,
(
1
,),
{},
'||O'
,
[
'a'
])
self
.
assertRaises
(
RuntimeError
,
_testcapi
.
parse_tuple_and_keywords
,
(
1
,),
{},
'|O'
,
[
'a'
,
'b'
])
self
.
assertRaises
(
RuntimeError
,
_testcapi
.
parse_tuple_and_keywords
,
(
1
,),
{},
'|OO'
,
[
'a'
])
class
Test_testcapi
(
unittest
.
TestCase
):
locals
().
update
((
name
,
getattr
(
_testcapi
,
name
))
for
name
in
dir
(
_testcapi
)
if
name
.
startswith
(
'test_'
)
and
name
.
endswith
(
'_code'
))
def
test_main
():
tests
=
[
Signed_TestCase
,
Unsigned_TestCase
,
LongLong_TestCase
,
Tuple_TestCase
,
Keywords_TestCase
,
Bytes_TestCase
,
String_TestCase
,
Unicode_TestCase
,
SkipitemTest
,
ParseTupleAndKeywords_Test
,
Test_testcapi
]
test_support
.
run_unittest
(
*
tests
)
if
__name__
==
"__main__"
:
test_main
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment