Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit 0ff13b24045d · 2020-05-09T18:24:13.000+02:00
* 4.4:
  [HttpClient] fix testTimeoutIsNotAFatalError
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -97,7 +97,7 @@ public function testTimeoutIsNotAFatalError()
     {
         $client = $this->getHttpClient(__FUNCTION__);
         $response = $client->request('GET', 'http://localhost:8057/timeout-body', [
-            'timeout' => 0.3,
+            'timeout' => 0.1,
         ]);
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function testTimeoutIsNotAFatalError()`
`97`	`97`	`{`
`98`	`98`	`$client = $this->getHttpClient(__FUNCTION__);`
`99`	`99`	`$response = $client->request('GET', 'http://localhost:8057/timeout-body', [`
`100`		`- 'timeout' => 0.3,`
	`100`	`+ 'timeout' => 0.1,`
`101`	`101`	`]);`
`102`	`102`
`103`	`103`	`try {`