diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.7

Browse Source 
* 2.3:
  [Process] Fix transient test on Windows
This commit is contained in:
Nicolas Grekas 2015-12-23 08:54:09 +01:00
commit 53b0d77419
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/Process/Tests/ProcessTest.php
View File

@ -747,7 +747,7 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
} }
$this->skipIfNotEnhancedSigchild(false); $this->skipIfNotEnhancedSigchild(false);
$process = $this->getProcess(self::$phpBin.' -r "while (true) usleep(100);"'); $process = $this->getProcess(self::$phpBin.' -r "sleep(32.1)"');
$process->start(); $process->start();
posix_kill($process->getPid(), 9); // SIGKILL posix_kill($process->getPid(), 9); // SIGKILL
@ -831,9 +831,8 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
$this->fail('A RuntimeException should have been raised'); $this->fail('A RuntimeException should have been raised');
} catch (RuntimeException $e) { } catch (RuntimeException $e) {
} }
$duration = microtime(true) - $start;
$this->assertLessThan(3, $duration); $this->assertLessThan(15, microtime(true) - $start);
throw $e; throw $e;
} }