Try to fix transient in test_repl

Author: msimacek

graalpython/com.oracle.graal.python.test/src/runner.py

@@ -149,7 +149,7 @@ def from_test_case(cls, test_file: Path, test: unittest.TestCase):
                     test_id = f'<{action}>'
                 else:
                     test_id = f'{class_name}.<{action}>'
-        elif type(test).id is not unittest.TestCase.id:
+        elif type(test).id is not unittest.TestCase.id and type(test) is not unittest.FunctionTestCase:
             # Qualify doctests so that we know what they are
             test_id = f'{type(test).__qualname__}.{test_id}'
         return cls(test_file, test_id)

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

@@ -82,8 +82,8 @@ def validate_repl(stdin, python_args=(), ignore_preamble=True):
                 rlist, _, _ = select.select([pty_parent], [], [], 60)
                 assert pty_parent in rlist, f"Timed out waiting for REPL output. Output: {whole_out}{out}"
                 out += os.read(pty_parent, 1024).decode('utf-8')
-                out = out.replace('\r\n', '\n')
                 out = re.sub(r'\x1b\[(?:\?2004[hl]|\d+[A-G])', '', out)
+                out = out.replace('\r\n', '\n')
                 if out == '>>> ' or out.endswith(('\n>>> ', '\n... ')):
                     prompt = out[:3]
                     actual = out[:-5]