Skip to content

Commit 5c1378b

Browse files
msimacekmsimacek
committed
[GR-22564] Catch Java exceptions in the first iteration of the retagger
PullRequest: graalpython/1065
2 parents 6ec8212 + c81b3aa commit 5c1378b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+753
-3
lines changed

‎graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,13 @@ def parse_unittest_output(output):
163163
# entirely
164164
testfile_stem = os.path.splitext(os.path.basename(testfile))[0]
165165
testmod = "test." + testfile_stem
166-
cmd = [timeout, "-s", "9", "120"] + executable + ["-S", "-m"]
166+
cmd = [timeout, "-s", "9", "120"] + executable
167+
if repeat == 0:
168+
# Allow catching Java exceptions in the first iteration only, so that subsequent iterations
169+
# (there will be one even if everything succeeds) filter out possible false-passes caused by
170+
# the tests catching all exceptions somewhere
171+
cmd += ['--experimental-options', '--python.CatchAllExceptions']
172+
cmd += ["-S", "-m", "unittest", "-v"]
167173
tagfile = os.path.join(TAGS_DIR, testfile_stem + ".txt")
168174
if retag and repeat == 0:
169175
test_selectors = []
@@ -176,7 +182,6 @@ def parse_unittest_output(output):
176182
continue
177183

178184
print("[%d/%d, Try %d] Testing %s" %(idx + 1, len(testfiles), repeat + 1, testmod))
179-
cmd += ["unittest", "-v"]
180185
for selector in test_selectors:
181186
cmd += ["-k", selector]
182187
cmd.append(testfile)

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_ast.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*graalpython.lib-python.3.test.test_ast.AST_Tests.test_field_attr_writable
33
*graalpython.lib-python.3.test.test_ast.AST_Tests.test_issue31592
44
*graalpython.lib-python.3.test.test_ast.AST_Tests.test_realtype
5+
*graalpython.lib-python.3.test.test_ast.ConstantTests.test_load_const

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_base64.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,12 @@
1+
*graalpython.lib-python.3.test.test_base64.BaseXYTestCase.test_ErrorHeritage
2+
*graalpython.lib-python.3.test.test_base64.BaseXYTestCase.test_a85_padding
3+
*graalpython.lib-python.3.test.test_base64.BaseXYTestCase.test_a85decode_errors
4+
*graalpython.lib-python.3.test.test_base64.BaseXYTestCase.test_b32decode_casefold
5+
*graalpython.lib-python.3.test.test_base64.BaseXYTestCase.test_b32decode_error
6+
*graalpython.lib-python.3.test.test_base64.BaseXYTestCase.test_b85_padding
7+
*graalpython.lib-python.3.test.test_base64.BaseXYTestCase.test_b85decode_errors
8+
*graalpython.lib-python.3.test.test_base64.BaseXYTestCase.test_decode_nonascii_str
19
*graalpython.lib-python.3.test.test_base64.LegacyBase64TestCase.test_decode
10+
*graalpython.lib-python.3.test.test_base64.LegacyBase64TestCase.test_decodestring_warns
11+
*graalpython.lib-python.3.test.test_base64.LegacyBase64TestCase.test_encode
12+
*graalpython.lib-python.3.test.test_base64.LegacyBase64TestCase.test_encodestring_warns

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_binascii.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
*graalpython.lib-python.3.test.test_binascii.ArrayBinASCIITest.test_b2a_base64_newline
2+
*graalpython.lib-python.3.test.test_binascii.ArrayBinASCIITest.test_exceptions
3+
*graalpython.lib-python.3.test.test_binascii.ArrayBinASCIITest.test_hex
24
*graalpython.lib-python.3.test.test_binascii.BinASCIITest.test_b2a_base64_newline
5+
*graalpython.lib-python.3.test.test_binascii.BinASCIITest.test_base64valid
6+
*graalpython.lib-python.3.test.test_binascii.BinASCIITest.test_exceptions
7+
*graalpython.lib-python.3.test.test_binascii.BinASCIITest.test_hex
38
*graalpython.lib-python.3.test.test_binascii.BytearrayBinASCIITest.test_b2a_base64_newline
9+
*graalpython.lib-python.3.test.test_binascii.BytearrayBinASCIITest.test_base64valid
10+
*graalpython.lib-python.3.test.test_binascii.BytearrayBinASCIITest.test_exceptions
11+
*graalpython.lib-python.3.test.test_binascii.BytearrayBinASCIITest.test_hex
412
*graalpython.lib-python.3.test.test_binascii.MemoryviewBinASCIITest.test_b2a_base64_newline
13+
*graalpython.lib-python.3.test.test_binascii.MemoryviewBinASCIITest.test_exceptions
14+
*graalpython.lib-python.3.test.test_binascii.MemoryviewBinASCIITest.test_hex

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_builtin.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_next
2121
*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_oct
2222
*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_open_default_encoding
23+
*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_pow
2324
*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_repr
2425
*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_round_large
2526
*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_type

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bytes.txt

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,68 @@
1+
*graalpython.lib-python.3.test.test_bytes.AssortedBytesTest.test_compare
2+
*graalpython.lib-python.3.test.test_bytes.AssortedBytesTest.test_compare_bytes_to_bytearray
3+
*graalpython.lib-python.3.test.test_bytes.AssortedBytesTest.test_from_bytearray
4+
*graalpython.lib-python.3.test.test_bytes.AssortedBytesTest.test_return_self
5+
*graalpython.lib-python.3.test.test_bytes.AssortedBytesTest.test_rsplit_bytearray
6+
*graalpython.lib-python.3.test.test_bytes.AssortedBytesTest.test_split_bytearray
7+
*graalpython.lib-python.3.test.test_bytes.AssortedBytesTest.test_to_str
8+
*graalpython.lib-python.3.test.test_bytes.ByteArrayAsStringTest.test_fixtype
9+
*graalpython.lib-python.3.test.test_bytes.ByteArrayAsStringTest.test_lower
10+
*graalpython.lib-python.3.test.test_bytes.ByteArrayAsStringTest.test_replace_overflow
11+
*graalpython.lib-python.3.test.test_bytes.ByteArrayAsStringTest.test_strip_whitespace
12+
*graalpython.lib-python.3.test.test_bytes.ByteArrayAsStringTest.test_upper
13+
*graalpython.lib-python.3.test.test_bytes.ByteArraySubclassTest.test_join
14+
*graalpython.lib-python.3.test.test_bytes.ByteArraySubclassTest.test_pickle
15+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_basics
16+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_bytearray_api
17+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_clear
18+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_compare_to_str
19+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_concat
20+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_constructor_overflow
21+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_copy
22+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_del_expand
23+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_delitem
24+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_empty_sequence
25+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_endswith
26+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_exhausted_iterator
27+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_extended_getslice
28+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_from_int
29+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_from_iterable
30+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_from_list
31+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_from_ssize
32+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_from_tuple
33+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_getslice
34+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_iconcat
35+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_iterator_length_hint
36+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_join
37+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_maketrans
38+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_nosort
39+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_obsolete_write_lock
40+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_ord
41+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_pickling
42+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_regexps
43+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_repeat
44+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_repeat_1char
45+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_replace
46+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_reverse
47+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_reversed
48+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_rsplit_unicodewhitespace
49+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_setslice
50+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_setslice_extend
51+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_setslice_trap
52+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_split_int_error
53+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_split_string_error
54+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_split_unicodewhitespace
55+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_startswith
56+
*graalpython.lib-python.3.test.test_bytes.ByteArrayTest.test_translate
57+
*graalpython.lib-python.3.test.test_bytes.BytesAsStringTest.test_fixtype
58+
*graalpython.lib-python.3.test.test_bytes.BytesAsStringTest.test_lower
59+
*graalpython.lib-python.3.test.test_bytes.BytesAsStringTest.test_replace_overflow
60+
*graalpython.lib-python.3.test.test_bytes.BytesAsStringTest.test_strip
61+
*graalpython.lib-python.3.test.test_bytes.BytesAsStringTest.test_strip_whitespace
62+
*graalpython.lib-python.3.test.test_bytes.BytesAsStringTest.test_upper
63+
*graalpython.lib-python.3.test.test_bytes.BytesSubclassTest.test_copy
64+
*graalpython.lib-python.3.test.test_bytes.BytesSubclassTest.test_join
65+
*graalpython.lib-python.3.test.test_bytes.BytesSubclassTest.test_pickle
166
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_basics
267
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_buffer_is_readonly
368
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_compare_to_str
@@ -16,3 +81,15 @@
1681
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_getslice
1782
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_join
1883
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_maketrans
84+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_ord
85+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_pickling
86+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_repeat
87+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_repeat_1char
88+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_replace
89+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_reversed
90+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_rsplit_unicodewhitespace
91+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_split_int_error
92+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_split_string_error
93+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_split_unicodewhitespace
94+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_startswith
95+
*graalpython.lib-python.3.test.test_bytes.BytesTest.test_translate

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_cmd_line.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_argv0_normalization
22
*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_directories
3+
*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_run_module_bug1764407

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codeop.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*graalpython.lib-python.3.test.test_codeop.CodeopTests.test_filename
2+
*graalpython.lib-python.3.test.test_codeop.CodeopTests.test_invalid

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_collections.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*graalpython.lib-python.3.test.test_collections.TestChainMap.test_bool
33
*graalpython.lib-python.3.test.test_collections.TestChainMap.test_constructor
44
*graalpython.lib-python.3.test.test_collections.TestChainMap.test_dict_coercion
5+
*graalpython.lib-python.3.test.test_collections.TestChainMap.test_missing
56
*graalpython.lib-python.3.test.test_collections.TestChainMap.test_new_child
67
*graalpython.lib-python.3.test.test_collections.TestChainMap.test_order_preservation
78
*graalpython.lib-python.3.test.test_collections.TestChainMap.test_ordering

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_compile.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,20 @@
11
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_annotation_limit
2+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_argument_handling
23
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_argument_order
4+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_compiler_recursion_limit
5+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_dead_blocks_do_not_generate_bytecode
6+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_duplicate_global_local
7+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_empty
8+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_float_literals
9+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_for_distinct_code_objects
10+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_indentation
11+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_lambda_doc
12+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_literals_with_leading_zeroes
13+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_merge_constants
14+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_no_ending_newline
15+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_none_assignment
16+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_none_keyword_arg
17+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_other_newlines
18+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_peephole_opt_unreachable_code_array_access_in_bounds
19+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_same_filename_used
20+
*graalpython.lib-python.3.test.test_compile.TestSpecifics.test_sequence_unpacking_error

0 commit comments

Comments
 (0)