Improve test suite to avoid race condition for functional tests

Author: clue

tests/FunctionalTest.php

@@ -196,25 +196,43 @@ public function testCreateClientWithAuthUrlReceivesSessionInit()
         $factory = new Factory();
 
         $url = rawurlencode(self::$username) . ':' . rawurlencode(self::$password) . '@' . self::$host;
-        $promise = $factory->createClient($url);
-        $client = Block\await($promise, Loop::get(), 10.0);
 
-        $message = $this->awaitMessage($client);
-        $this->assertEquals('SessionInit', $message->MsgType);
+        $promise = $factory->createClient($url)->then(function (Client $client) {
+            return new Promise(function ($resolve, $reject) use ($client) {
+                $client->once('data', function ($message) use ($client, $resolve) {
+                    $client->close();
+                    $resolve($message);
+                });
 
-        $client->close();
+                $client->once('error', $reject);
+                $client->once('close', $reject);
+            });
+        });
+
+        $message = Block\await($promise, Loop::get(), 10.0);
+        $this->assertEquals('SessionInit', $message->MsgType);
     }
 
     public function testRequestBacklogReceivesBacklog()
     {
         $factory = new Factory();
 
         $url = rawurlencode(self::$username) . ':' . rawurlencode(self::$password) . '@' . self::$host;
-        $promise = $factory->createClient($url);
-        $client = Block\await($promise, Loop::get(), 10.0);
-        /* @var $client Client */
 
-        $message = $this->awaitMessage($client);
+        $promise = $factory->createClient($url)->then(function (Client $client) {
+            return new Promise(function ($resolve, $reject) use ($client) {
+                $client->once('data', function ($message) use ($client, $resolve) {
+                    $resolve(array($client, $message));
+                });
+
+                $client->once('error', $reject);
+                $client->once('close', $reject);
+            });
+        });
+
+        list($client, $message) = Block\await($promise, Loop::get(), 10.0);
+        assert($client instanceof Client);
+
         $this->assertEquals('SessionInit', $message->MsgType);
 
         // try to pick first buffer