Bug 1846617 - Use mozprocess.run_and_wait in cppunittests r=hneiva

Differential Revision: https://phabricator.services.mozilla.com/D185248

Author: gbrownmozilla

testing/remotecppunittests.py

@@ -119,7 +119,13 @@ def build_environment(self):
         return env
 
     def run_one_test(
-        self, prog, env, symbols_path=None, interactive=False, timeout_factor=1
+        self,
+        prog,
+        env,
+        symbols_path=None,
+        utility_path=None,
+        interactive=False,
+        timeout_factor=1,
     ):
         """
         Run a single C++ unit test program remotely.

testing/runcppunittests.py

@@ -30,7 +30,13 @@ class CPPUnitTests(object):
     TEST_PROC_NO_OUTPUT_TIMEOUT = 300
 
     def run_one_test(
-        self, prog, env, symbols_path=None, interactive=False, timeout_factor=1
+        self,
+        prog,
+        env,
+        symbols_path=None,
+        utility_path=None,
+        interactive=False,
+        timeout_factor=1,
     ):
         """
         Run a single C++ unit test program.
@@ -44,59 +50,65 @@ def run_one_test(
 
         Return True if the program exits with a zero status, False otherwise.
         """
+        CPPUnitTests.run_one_test.timed_out = False
+        output = []
+
+        def timeout_handler(proc):
+            CPPUnitTests.run_one_test.timed_out = True
+            message = "timed out after %d seconds" % CPPUnitTests.TEST_PROC_TIMEOUT
+            self.log.test_end(
+                basename, status="TIMEOUT", expected="PASS", message=message
+            )
+            mozcrash.kill_and_get_minidump(proc.pid, tempdir, utility_path)
+
+        def output_timeout_handler(proc):
+            CPPUnitTests.run_one_test.timed_out = True
+            message = (
+                "timed out after %d seconds without output"
+                % CPPUnitTests.TEST_PROC_NO_OUTPUT_TIMEOUT
+            )
+            self.log.test_end(
+                basename, status="TIMEOUT", expected="PASS", message=message
+            )
+            mozcrash.kill_and_get_minidump(proc.pid, tempdir, utility_path)
+
+        def output_line_handler(_, line):
+            fixed_line = self.fix_stack(line) if self.fix_stack else line
+            if interactive:
+                print(fixed_line)
+            else:
+                output.append(fixed_line)
+
         basename = os.path.basename(prog)
         self.log.test_start(basename)
         with mozfile.TemporaryDirectory() as tempdir:
-            if interactive:
-                # For tests run locally, via mach, print output directly
-                proc = mozprocess.ProcessHandler(
-                    [prog],
-                    cwd=tempdir,
-                    env=env,
-                    storeOutput=False,
-                    universal_newlines=True,
-                )
-            else:
-                proc = mozprocess.ProcessHandler(
-                    [prog],
-                    cwd=tempdir,
-                    env=env,
-                    storeOutput=True,
-                    processOutputLine=lambda _: None,
-                    universal_newlines=True,
-                )
-            # TODO: After bug 811320 is fixed, don't let .run() kill the process,
-            # instead use a timeout in .wait() and then kill to get a stack.
             test_timeout = CPPUnitTests.TEST_PROC_TIMEOUT * timeout_factor
-            proc.run(
+            proc = mozprocess.run_and_wait(
+                [prog],
+                cwd=tempdir,
+                env=env,
+                output_line_handler=output_line_handler,
                 timeout=test_timeout,
-                outputTimeout=CPPUnitTests.TEST_PROC_NO_OUTPUT_TIMEOUT,
+                timeout_handler=timeout_handler,
+                output_timeout=CPPUnitTests.TEST_PROC_NO_OUTPUT_TIMEOUT,
+                output_timeout_handler=output_timeout_handler,
             )
-            proc.wait()
-            if proc.output:
-                if self.fix_stack:
-                    procOutput = [self.fix_stack(l) for l in proc.output]
-                else:
-                    procOutput = proc.output
-
-                output = "\n%s" % "\n".join(procOutput)
+
+            if output:
+                output = "\n%s" % "\n".join(output)
                 self.log.process_output(proc.pid, output, command=[prog])
-            if proc.timedOut:
-                message = "timed out after %d seconds" % CPPUnitTests.TEST_PROC_TIMEOUT
-                self.log.test_end(
-                    basename, status="TIMEOUT", expected="PASS", message=message
-                )
+            if CPPUnitTests.run_one_test.timed_out:
                 return False
             if mozcrash.check_for_crashes(tempdir, symbols_path, test_name=basename):
                 self.log.test_end(basename, status="CRASH", expected="PASS")
                 return False
-            result = proc.proc.returncode == 0
+            result = proc.returncode == 0
             if not result:
                 self.log.test_end(
                     basename,
                     status="FAIL",
                     expected="PASS",
-                    message=("test failed with return code %d" % proc.proc.returncode),
+                    message=("test failed with return code %d" % proc.returncode),
                 )
             else:
                 self.log.test_end(basename, status="PASS", expected="PASS")
@@ -201,7 +213,7 @@ def run_tests(
             test_path = prog[0]
             timeout_factor = prog[1]
             single_result = self.run_one_test(
-                test_path, env, symbols_path, interactive, timeout_factor
+                test_path, env, symbols_path, utility_path, interactive, timeout_factor
             )
             if single_result:
                 pass_count += 1