[HttpClient] fix issues in tests

Author: nicolas-grekas

Test/TestHttpServer.php

@@ -19,22 +19,23 @@
  */
 class TestHttpServer
 {
-    private static $started;
+    private static $process;
 
     public static function start()
     {
-        if (self::$started) {
-            return;
+        if (self::$process) {
+            self::$process->stop();
         }
 
         $finder = new PhpExecutableFinder();
         $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', '127.0.0.1:8057']));
         $process->setWorkingDirectory(__DIR__.'/Fixtures/web');
         $process->start();
 
-        register_shutdown_function([$process, 'stop']);
-        sleep('\\' === \DIRECTORY_SEPARATOR ? 10 : 1);
+        do {
+            usleep(50000);
+        } while (!@fopen('http://127.0.0.1:8057/', 'r'));
 
-        self::$started = true;
+        self::$process = $process;
     }
 }