Skip to content

Commit c5ce962

Browse files
Merge branch '6.2' into 6.3
* 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
2 parents 02fc676 + 1603ae3 commit c5ce962

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

Tests/ProcessTest.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ public function testInvalidCwd()
6666
$cmd->run();
6767
}
6868

69+
/**
70+
* @group transient-on-windows
71+
*/
6972
public function testThatProcessDoesNotThrowWarningDuringRun()
7073
{
71-
if ('\\' === \DIRECTORY_SEPARATOR) {
72-
$this->markTestSkipped('This test is transient on Windows');
73-
}
7474
@trigger_error('Test Error', \E_USER_NOTICE);
7575
$process = $this->getProcessForCode('sleep(3)');
7676
$process->run();
@@ -130,12 +130,11 @@ public function testStopWithTimeoutIsActuallyWorking()
130130
$this->assertLessThan(15, microtime(true) - $start);
131131
}
132132

133+
/**
134+
* @group transient-on-windows
135+
*/
133136
public function testWaitUntilSpecificOutput()
134137
{
135-
if ('\\' === \DIRECTORY_SEPARATOR) {
136-
$this->markTestIncomplete('This test is too transient on Windows, help wanted to improve it');
137-
}
138-
139138
$p = $this->getProcess([self::$phpBin, __DIR__.'/KillableProcessWithOutput.php']);
140139
$p->start();
141140

@@ -1536,6 +1535,9 @@ public function testEnvCaseInsensitiveOnWindows()
15361535
}
15371536
}
15381537

1538+
/**
1539+
* @group transient-on-windows
1540+
*/
15391541
public function testNotTerminableInputPipe()
15401542
{
15411543
$process = $this->getProcess('echo foo');

0 commit comments

Comments
 (0)