Merge branch '2.5'

fabpot · fabpot · commit ecddaf6e58ef · 2014-11-03T20:49:01.000+01:00
* 2.5:
  fixed test that randomly fails
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -80,7 +80,7 @@ public function testStopWithTimeoutIsActuallyWorking()
         }
         $duration = microtime(true) - $start;
 
-        $this->assertLessThan(1.8, $duration);
+        $this->assertLessThan(4, $duration);
     }
 
     public function testAllOutputIsActuallyReadOnTermination()

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function testStopWithTimeoutIsActuallyWorking()`
`80`	`80`	`}`
`81`	`81`	`$duration = microtime(true) - $start;`
`82`	`82`
`83`		`- $this->assertLessThan(1.8, $duration);`
	`83`	`+ $this->assertLessThan(4, $duration);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public function testAllOutputIsActuallyReadOnTermination()`