Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit b0a78f054626 · 2019-10-15T14:38:35.000+02:00
* 4.3:
  [HttpClient] workaround curl_multi_select() issue
  [CI] fix building local packages
  Increase limits for flakey appveyor tests
diff --git a/Test/HttpClientTestCase.php b/Test/HttpClientTestCase.php
@@ -597,9 +597,9 @@ public function testNotATimeout()
     {
         $client = $this->getHttpClient(__FUNCTION__);
         $response = $client->request('GET', 'http://localhost:8057/timeout-header', [
-            'timeout' => 0.5,
+            'timeout' => 0.9,
         ]);
-        usleep(510000);
+        sleep(1);
         $this->assertSame(200, $response->getStatusCode());
     }
 
@@ -669,7 +669,7 @@ public function testDestruct()
         $duration = microtime(true) - $start;
 
         $this->assertGreaterThan(1, $duration);
-        $this->assertLessThan(3, $duration);
+        $this->assertLessThan(4, $duration);
     }
 
     public function testProxy()

Original file line number	Diff line number	Diff line change
`@@ -597,9 +597,9 @@ public function testNotATimeout()`
`597`	`597`	`{`
`598`	`598`	`$client = $this->getHttpClient(__FUNCTION__);`
`599`	`599`	`$response = $client->request('GET', 'http://localhost:8057/timeout-header', [`
`600`		`- 'timeout' => 0.5,`
	`600`	`+ 'timeout' => 0.9,`
`601`	`601`	`]);`
`602`		`- usleep(510000);`
	`602`	`+ sleep(1);`
`603`	`603`	`$this->assertSame(200, $response->getStatusCode());`
`604`	`604`	`}`
`605`	`605`
`@@ -669,7 +669,7 @@ public function testDestruct()`
`669`	`669`	`$duration = microtime(true) - $start;`
`670`	`670`
`671`	`671`	`$this->assertGreaterThan(1, $duration);`
`672`		`- $this->assertLessThan(3, $duration);`
	`672`	`+ $this->assertLessThan(4, $duration);`
`673`	`673`	`}`
`674`	`674`
`675`	`675`	`public function testProxy()`