Some more log parser changes and try to get interrupt to be less flakey

Rich Chiodo (rchiodo) · Oct 10, 2020 · Oct 7, 2020 · Oct 8, 2020 · Oct 8, 2020 · Oct 8, 2020
commit e922c1057e409c9da8b9fbfd86b492867bc50639
diff --git a/build/ci/scripts/runFunctionalTests.js b/build/ci/scripts/runFunctionalTests.js
@@ -68,12 +68,13 @@ async function generateGroups(files) {
 
 async function runIndividualTest(extraArgs, file, index) {
     var subMochaFile = `${mochaBaseFile}_${index}_${path.basename(file)}${mochaFileExt}`;
-    process.env['MOCHA_FILE'] = subMochaFile;
     var args = gatherArgs(extraArgs, file);
     console.log(`Running functional test for file ${file} ...`);
     var exitCode = await new Promise((resolve) => {
         // Spawn the sub node process
-        var proc = child_process.fork('./node_modules/mocha/bin/_mocha', args);
+        var proc = child_process.fork('./node_modules/mocha/bin/_mocha', args, {
+            env: { ...process.env, MOCHA_FILE: subMochaFile }
+        });
         proc.on('exit', resolve);
     });
 

diff --git a/pythonFiles/vscode_datascience_helpers/tests/logParser.py b/pythonFiles/vscode_datascience_helpers/tests/logParser.py
@@ -1,3 +1,4 @@
+from io import TextIOWrapper
 import sys
 import argparse
 import os
@@ -18,13 +19,22 @@
 )
 ansi_escape = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
 pid_regex = re.compile(r"(\d+).*")
+timestamp_regex = re.compile(r"\d{4}-\d{2}-\d{2}T.*\dZ")
 
+def stripTimestamp(line: str):  
+    match = timestamp_regex.match(line)
+    if (match):
+        return line[match.endpos]
+    return line
+
+def readStripLines(f: TextIOWrapper):
+    return map(f.readlines(), stripTimestamp)
 
 def printTestOutput(testlog):
     # Find all the lines that don't have a PID in them. These are the test output
     p = Path(testlog[0])
     with p.open() as f:
-        for line in f.readlines():
+        for line in readStripLines(f):
             stripped = line.strip()
             if len(stripped) > 2 and stripped[0] == "\x1B" and stripped[1] == "[":
                 print(line.rstrip())  # Should be a test line as it has color encoding
@@ -38,7 +48,7 @@ def splitByPid(testlog):
     logs = {}
     pid = None
     with p.open() as f:
-        for line in f.readlines():
+        for line in readStripLines(f):
             stripped = ansi_escape.sub("", line.strip())
             # See if starts with a pid
             if len(stripped) > 0 and stripped[0] <= "9" and stripped[0] >= "0":

diff --git a/src/test/datascience/raw-kernel/rawKernel.functional.test.ts b/src/test/datascience/raw-kernel/rawKernel.functional.test.ts
@@ -120,7 +120,13 @@ suite('DataScience raw kernel tests', () => {
         // Hence timeout is a test failure.
         const longCellExecutionRequest = requestExecute(
             rawKernel,
-            'import time\nfor i in range(300):\n    time.sleep(1)',
+            `import time
+import sys
+for i in range(3000):
+    sys.stdout.write('.')
+    sys.stdout.flush()
+    time.sleep(0.1)
+    sys.stdout.write('\r')`,
             executionStarted
         );