Skip to content

Commit ce6ad28

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: fix used class after merge fix tests [Console] Only execute additional checks for color support if the output is a TTY fix aircraft inflection [TwigBundle] Fix configuration when 'paths' is null Fix AttributeClassLoaderTestCase + Added ->setUp() - Removed 'abstract' so it'd be picked up by Tests. * Changed getNamespace() to full path Qualified Name. * Rename file AttributeClassLoaderTestCase to AttributeClassLoaderTest and the class. register the MailPaceTransportFactory [String] Correct inflection of axis [Security] Fix `AuthenticationUtils::getLastUsername()` returning null [Process] Fixed inconsistent test fix(ldap): replace {username} with {user_identifier} in LDAP factories
2 parents 776a9e9 + c9920b0 commit ce6ad28

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/ErrorProcessInitiator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
while (!str_contains($process->getOutput(), 'ready')) {
2626
usleep(1000);
2727
}
28-
$process->signal(\SIGSTOP);
28+
$process->isRunning() && $process->signal(\SIGSTOP);
2929
$process->wait();
3030

3131
return $process->getExitCode();

0 commit comments

Comments
 (0)