Skip to content

Commit

Permalink
Merge branch '6.2' into 6.3
Browse files Browse the repository at this point in the history
* 6.2:
  [PhpUnitBridge] Kill the last concurrent process when it stales for more than 60s
  [Intl] fix test
  [Intl] Use VarExporter::export() in PhpBundleWriter
  Use triggering class to generate baseline for deprecation messages from DebugClassLoader
  [Security] Fix false-string handling in RememberMeAuthenticator
  [CssSelector] Tests on Xpath translator will always pass
  [Serializer] Fix Normalizer not utilizing converted name for index variadic param
  [DepdencyInjection] Fix costly logic when checking errored definitions
  Fix merge
  fix children cond
  [DoctrineBridge] Load refreshed user proxy
  [DependencyInjection] Don't ignore attributes on the actual decorator
  [FrameworkBundle] Prevent `cache:clear` to lose files on subsequent runs
  • Loading branch information
nicolas-grekas committed Jul 12, 2023
2 parents 02fc676 + 1603ae3 commit c5ce962
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions Tests/ProcessTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -1536,6 +1535,9 @@ public function testEnvCaseInsensitiveOnWindows()
}
}

/**
* @group transient-on-windows
*/
public function testNotTerminableInputPipe()
{
$process = $this->getProcess('echo foo');
Expand Down

0 comments on commit c5ce962

Please sign in to comment.