[PhpUnitBridge] Kill the last concurrent process when it stales for more than 60s

nicolas-grekas · nicolas-grekas · commit 036b6a99abb2 · 2023-07-12T17:44:31.000+02:00
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -398,6 +398,9 @@ class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\Bla
         }
     }
 
+    $lastOutput = null;
+    $lastOutputTime = null;
+
     while ($runningProcs) {
         usleep(300000);
         $terminatedProcs = [];
@@ -410,6 +413,26 @@ class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\Bla
             }
         }
 
+        if (!$terminatedProcs && 1 === count($runningProcs)) {
+            $component = key($runningProcs);
+
+            $output = file_get_contents("$component/phpunit.stdout");
+            $output .= file_get_contents("$component/phpunit.stderr");
+
+            if ($lastOutput !== $output) {
+                $lastOutput = $output;
+                $lastOutputTime = microtime(true);
+            } elseif (microtime(true) - $lastOutputTime > 60) {
+                echo "\033[41mTimeout\033[0m $component\n\n";
+
+                if ('\\' === \DIRECTORY_SEPARATOR) {
+                    exec(sprintf('taskkill /F /T /PID %d 2>&1', $procStatus['pid']), $output, $exitCode);
+                } else {
+                    proc_terminate(current($runningProcs));
+                }
+            }
+        }
+
         foreach ($terminatedProcs as $component => $procStatus) {
             foreach (['out', 'err'] as $file) {
                 $file = "$component/phpunit.std$file";
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -66,11 +66,11 @@ public function testInvalidCwd()
         $cmd->run();
     }
 
+    /**
+     * @group transient-on-windows
+     */
     public function testThatProcessDoesNotThrowWarningDuringRun()
     {
-        if ('\\' === \DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('This test is transient on Windows');
-        }
         @trigger_error('Test Error', \E_USER_NOTICE);
         $process = $this->getProcessForCode('sleep(3)');
         $process->run();
@@ -130,12 +130,11 @@ public function testStopWithTimeoutIsActuallyWorking()
         $this->assertLessThan(15, microtime(true) - $start);
     }
 
+    /**
+     * @group transient-on-windows
+     */
     public function testWaitUntilSpecificOutput()
     {
-        if ('\\' === \DIRECTORY_SEPARATOR) {
-            $this->markTestIncomplete('This test is too transient on Windows, help wanted to improve it');
-        }
-
         $p = $this->getProcess([self::$phpBin, __DIR__.'/KillableProcessWithOutput.php']);
         $p->start();
 
@@ -1538,6 +1537,9 @@ public function testEnvCaseInsensitiveOnWindows()
         }
     }
 
+    /**
+     * @group transient-on-windows
+     */
     public function testNotTerminableInputPipe()
     {
         $process = $this->getProcess('echo foo');

Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,11 @@ public function testInvalidCwd()`
`66`	`66`	`$cmd->run();`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ /**`
	`70`	`+ * @group transient-on-windows`
	`71`	`+ */`
`69`	`72`	`public function testThatProcessDoesNotThrowWarningDuringRun()`
`70`	`73`	`{`
`71`		`- if ('\\' === \DIRECTORY_SEPARATOR) {`
`72`		`- $this->markTestSkipped('This test is transient on Windows');`
`73`		`- }`
`74`	`74`	`@trigger_error('Test Error', \E_USER_NOTICE);`
`75`	`75`	`$process = $this->getProcessForCode('sleep(3)');`
`76`	`76`	`$process->run();`
`@@ -130,12 +130,11 @@ public function testStopWithTimeoutIsActuallyWorking()`
`130`	`130`	`$this->assertLessThan(15, microtime(true) - $start);`
`131`	`131`	`}`
`132`	`132`
	`133`	`+ /**`
	`134`	`+ * @group transient-on-windows`
	`135`	`+ */`
`133`	`136`	`public function testWaitUntilSpecificOutput()`
`134`	`137`	`{`
`135`		`- if ('\\' === \DIRECTORY_SEPARATOR) {`
`136`		`- $this->markTestIncomplete('This test is too transient on Windows, help wanted to improve it');`
`137`		`- }`
`138`		`-`
`139`	`138`	`$p = $this->getProcess([self::$phpBin, __DIR__.'/KillableProcessWithOutput.php']);`
`140`	`139`	`$p->start();`
`141`	`140`
`@@ -1538,6 +1537,9 @@ public function testEnvCaseInsensitiveOnWindows()`
`1538`	`1537`	`}`
`1539`	`1538`	`}`
`1540`	`1539`
	`1540`	`+ /**`
	`1541`	`+ * @group transient-on-windows`
	`1542`	`+ */`
`1541`	`1543`	`public function testNotTerminableInputPipe()`
`1542`	`1544`	`{`
`1543`	`1545`	`$process = $this->getProcess('echo foo');`