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