Merge branch '2.5'

* 2.5: fixed test that randomly fails
2014-11-03 20:49:01 +01:00 · 2014-11-03 20:49:01 +01:00 · ecddaf6e58
commit ecddaf6e58
parent 923c13f974 1bba7995df
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@ -80,7 +80,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
        }
        $duration = microtime(true) - $start;

-        $this->assertLessThan(1.8, $duration);
+        $this->assertLessThan(4, $duration);
    }

    public function testAllOutputIsActuallyReadOnTermination()