Merge branch 'mac-head' into topic/GR-14972-coverage

Author: timfel

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

@@ -100,6 +100,7 @@ def fun():
 
     executable = sys.executable.split(" ") # HACK: our sys.executable on Java is a cmdline
     re_success = re.compile("(test\S+) \(([^\s]+)\) \.\.\. ok$", re.MULTILINE)
+    re_failure = re.compile("(test\S+) \(([^\s]+)\) \.\.\. (?:ERROR|FAIL)$", re.MULTILINE)
     kwargs = {"stdout": subprocess.PIPE, "stderr": subprocess.PIPE, "text": True, "check": False}
 
     glob_pattern = os.path.join(os.path.dirname(test.__file__), "test_*.py")
@@ -169,15 +170,15 @@ def fun():
                 # we failed the first run, create a tag file with the passing
                 # tests (if any)
                 passing_tests = []
-
-                try:
-                    imported_test_module = __import__(testmod)
-                except:
-                    imported_test_module = None
+                failed_tests = []
 
                 def get_pass_name(funcname, classname):
-                    # try hard to get a most specific pattern
-                    if imported_test_module:
+                    try:
+                        imported_test_module = __import__(testmod)
+                    except:
+                        imported_test_module = None
+                    else:
+                        # try hard to get a most specific pattern
                         classname = "".join(classname.rpartition(testmod)[1:])
                         clazz = imported_test_module
                         path_to_class = classname.split(".")[1:]
@@ -191,13 +192,24 @@ def get_pass_name(funcname, classname):
 
                 # n.b.: we add a '*' in the front, so that unittests doesn't add
                 # its own asterisks, because now this is already a pattern
+
+                for funcname,classname in re_failure.findall(p.stdout):
+                    failed_tests.append("*" + get_pass_name(funcname, classname))
+                for funcname,classname in re_failure.findall(p.stderr):
+                    failed_tests.append("*" + get_pass_name(funcname, classname))
+
                 for funcname,classname in re_success.findall(p.stdout):
                     passing_tests.append("*" + get_pass_name(funcname, classname))
                 for funcname,classname in re_success.findall(p.stderr):
                     passing_tests.append("*" + get_pass_name(funcname, classname))
 
+                # n.b.: unittests uses the __qualname__ of the function as
+                # pattern, which we're trying to do as well. however, sometimes
+                # the same function is shared in multiple test classes, and
+                # fails in some. so we always subtract the failed patterns from
+                # the passed patterns
                 with open(tagfile, "w") as f:
-                    for passing_test in passing_tests:
+                    for passing_test in set(passing_tests) - set(failed_tests):
                         f.write(passing_test)
                         f.write("\n")
                 if not passing_tests:

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

@@ -0,0 +1 @@
+*wrapper

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

@@ -1 +1 @@
-test_decode
+*LegacyBase64TestCase.test_decode

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

@@ -1,3 +1 @@
-test_b2a_base64_newline
-test_b2a_base64_newline
-test_b2a_base64_newline
+*BinASCIITest.test_b2a_base64_newline

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

@@ -1,17 +0,0 @@
-test_backcompatibility
-test_keyword_args
-test_large_pyrange
-test_large_range
-test_negative_lo
-test_optionalSlicing
-test_precomputed
-test_random
-test_backcompatibility
-test_listDerived
-test_arg_parsing
-test_cmp_err
-test_get_only
-test_len_only
-test_non_sequence
-test_colors
-test_grades

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

@@ -1,6 +1,6 @@
-test_blocked
-test_callable
-test_contains
-test_convert
-test_fileclosed
-test_float
+*BoolTest.test_blocked
+*BoolTest.test_callable
+*BoolTest.test_contains
+*BoolTest.test_convert
+*BoolTest.test_fileclosed
+*BoolTest.test_float

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

@@ -1,29 +1,15 @@
-test_basics
-test_compare_to_str
-test_concat
-test_constructor_value_errors
-test_copy
-test_empty_sequence
-test_extended_getslice
-test_from_int
-test_from_list
-test_from_ssize
-test_getslice
-test_join
-test_maketrans
-test_basics
-test_compare_to_str
-test_concat
-test_constructor_value_errors
-test_copy
-test_empty_sequence
-test_extended_getslice
-test_from_int
-test_from_list
-test_from_ssize
-test_getslice
-test_join
-test_maketrans
-test_join
-test_copy
-test_join
+*BaseBytesTest.test_basics
+*BaseBytesTest.test_compare_to_str
+*BaseBytesTest.test_concat
+*BaseBytesTest.test_constructor_value_errors
+*BaseBytesTest.test_copy
+*BaseBytesTest.test_empty_sequence
+*BaseBytesTest.test_extended_getslice
+*BaseBytesTest.test_from_int
+*BaseBytesTest.test_from_list
+*BaseBytesTest.test_from_ssize
+*BaseBytesTest.test_getslice
+*BaseBytesTest.test_join
+*BaseBytesTest.test_maketrans
+*ByteArrayTest.test_copy
+*SubclassTest.test_join

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

@@ -1,51 +1,51 @@
-test_format
-test_formatmonth
-test_formatmonthname_with_year
-test_formatmonthname_without_year
-test_formatweekheader_long
-test_formatweekheader_short
-test_output
-test_output_htmlcalendar_encoding_ascii
-test_output_htmlcalendar_encoding_utf8
-test_output_textcalendar
-test_prmonth
-test_prweek
-test_pryear
-test_yeardayscalendar
-test_days
-test_enumerate_weekdays
-test_illegal_weekday_reported
-test_isleap
-test_itermonthdays
-test_itermonthdays2
-test_itermonthdays3
-test_itermonthdays4
-test_locale_calendars
-test_months
-test_setfirstweekday
-test_april
-test_december
-test_february
-test_april
-test_december
-test_february
-test_timegm
-test_december
-test_february_leap
-test_february_nonleap
-test_illegal_month_reported
-test_january
-test_thirteenth_month
-test_zeroth_month
-test_no_leapdays
-test_no_leapdays_upper_boundary
-test_no_range
-test_one_leapday_lower_boundary
-test_several_leapyears_in_range
-test__all__
-test_format_year
-test_format_year_head
-test_formatmonth
-test_formatmonthname
-test_formatweek
-test_formatweek_head
+*OutputTestCase.test_format
+*OutputTestCase.test_formatmonth
+*OutputTestCase.test_formatmonthname_with_year
+*OutputTestCase.test_formatmonthname_without_year
+*OutputTestCase.test_formatweekheader_long
+*OutputTestCase.test_formatweekheader_short
+*OutputTestCase.test_output
+*OutputTestCase.test_output_htmlcalendar_encoding_ascii
+*OutputTestCase.test_output_htmlcalendar_encoding_utf8
+*OutputTestCase.test_output_textcalendar
+*OutputTestCase.test_prmonth
+*OutputTestCase.test_prweek
+*OutputTestCase.test_pryear
+*OutputTestCase.test_yeardayscalendar
+*CalendarTestCase.test_days
+*CalendarTestCase.test_enumerate_weekdays
+*CalendarTestCase.test_illegal_weekday_reported
+*CalendarTestCase.test_isleap
+*CalendarTestCase.test_itermonthdays
+*CalendarTestCase.test_itermonthdays2
+*CalendarTestCase.test_itermonthdays3
+*CalendarTestCase.test_itermonthdays4
+*CalendarTestCase.test_locale_calendars
+*CalendarTestCase.test_months
+*CalendarTestCase.test_setfirstweekday
+*MondayTestCase.test_april
+*MondayTestCase.test_december
+*MondayTestCase.test_february
+*SundayTestCase.test_april
+*SundayTestCase.test_december
+*SundayTestCase.test_february
+*TimegmTestCase.test_timegm
+*MonthRangeTestCase.test_december
+*MonthRangeTestCase.test_february_leap
+*MonthRangeTestCase.test_february_nonleap
+*MonthRangeTestCase.test_illegal_month_reported
+*MonthRangeTestCase.test_january
+*MonthRangeTestCase.test_thirteenth_month
+*MonthRangeTestCase.test_zeroth_month
+*LeapdaysTestCase.test_no_leapdays
+*LeapdaysTestCase.test_no_leapdays_upper_boundary
+*LeapdaysTestCase.test_no_range
+*LeapdaysTestCase.test_one_leapday_lower_boundary
+*LeapdaysTestCase.test_several_leapyears_in_range
+*MiscTestCase.test__all__
+*TestSubClassingCase.test_format_year
+*TestSubClassingCase.test_format_year_head
+*TestSubClassingCase.test_formatmonth
+*TestSubClassingCase.test_formatmonthname
+*TestSubClassingCase.test_formatweek
+*TestSubClassingCase.test_formatweek_head

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

@@ -1,26 +1,26 @@
-test_oldargs0_0
-test_oldargs0_0_ext
-test_oldargs0_0_kw
-test_oldargs0_1
-test_oldargs0_1_ext
-test_oldargs0_1_kw
-test_oldargs0_2
-test_oldargs0_2_ext
-test_oldargs0_2_kw
-test_oldargs1_0
-test_oldargs1_0_ext
-test_oldargs1_0_kw
-test_oldargs1_1
-test_oldargs1_1_ext
-test_oldargs1_1_kw
-test_oldargs1_2
-test_oldargs1_2_ext
-test_oldargs1_2_kw
-test_varargs0
-test_varargs0_ext
-test_varargs1
-test_varargs1_ext
-test_varargs1_kw
-test_varargs2
-test_varargs2_ext
-test_varargs2_kw
+*CFunctionCalls.test_oldargs0_0
+*CFunctionCalls.test_oldargs0_0_ext
+*CFunctionCalls.test_oldargs0_0_kw
+*CFunctionCalls.test_oldargs0_1
+*CFunctionCalls.test_oldargs0_1_ext
+*CFunctionCalls.test_oldargs0_1_kw
+*CFunctionCalls.test_oldargs0_2
+*CFunctionCalls.test_oldargs0_2_ext
+*CFunctionCalls.test_oldargs0_2_kw
+*CFunctionCalls.test_oldargs1_0
+*CFunctionCalls.test_oldargs1_0_ext
+*CFunctionCalls.test_oldargs1_0_kw
+*CFunctionCalls.test_oldargs1_1
+*CFunctionCalls.test_oldargs1_1_ext
+*CFunctionCalls.test_oldargs1_1_kw
+*CFunctionCalls.test_oldargs1_2
+*CFunctionCalls.test_oldargs1_2_ext
+*CFunctionCalls.test_oldargs1_2_kw
+*CFunctionCalls.test_varargs0
+*CFunctionCalls.test_varargs0_ext
+*CFunctionCalls.test_varargs1
+*CFunctionCalls.test_varargs1_ext
+*CFunctionCalls.test_varargs1_kw
+*CFunctionCalls.test_varargs2
+*CFunctionCalls.test_varargs2_ext
+*CFunctionCalls.test_varargs2_kw

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

@@ -1,18 +1,18 @@
-testQSAndFormData
-testQSAndFormDataFile
-testQSAndUrlEncode
-test_all
-test_deprecated_parse_qs
-test_deprecated_parse_qsl
-test_escape
-test_fieldstorage_as_context_manager
-test_fieldstorage_invalid
-test_fieldstorage_multipart
-test_fieldstorage_multipart_leading_whitespace
-test_fieldstorage_multipart_non_ascii
-test_fieldstorage_multipart_w3c
-test_fieldstorage_part_content_length
-test_fieldstorage_properties
-test_log
-test_parse_header
-test_parse_multipart
+*CgiTests.testQSAndFormData
+*CgiTests.testQSAndFormDataFile
+*CgiTests.testQSAndUrlEncode
+*CgiTests.test_all
+*CgiTests.test_deprecated_parse_qs
+*CgiTests.test_deprecated_parse_qsl
+*CgiTests.test_escape
+*CgiTests.test_fieldstorage_as_context_manager
+*CgiTests.test_fieldstorage_invalid
+*CgiTests.test_fieldstorage_multipart
+*CgiTests.test_fieldstorage_multipart_leading_whitespace
+*CgiTests.test_fieldstorage_multipart_non_ascii
+*CgiTests.test_fieldstorage_multipart_w3c
+*CgiTests.test_fieldstorage_part_content_length
+*CgiTests.test_fieldstorage_properties
+*CgiTests.test_log
+*CgiTests.test_parse_header
+*CgiTests.test_parse_multipart