Merge branch 'master' of git.php.net:/pecl/http/pecl_http

[m6w6/ext-http] / tests / client015.phpt

diff --git a/tests/client015.phpt b/tests/client015.phpt
index 60d31323efc350230b7dc341ea2f866eab520470..f378653808824a2eb873857fe5242d8267fb86bc 100644 (file)
--- a/tests/client015.phpt
+++ b/tests/client015.phpt
@@ -3,37 +3,35 @@ http client event base
 --SKIPIF--
 <?php 
 include "skipif.inc";
-try {
-       $client = new http\Client;
-       if (!$client->enableEvents())
-               throw new Exception("need events support"); 
-} catch (Exception $e) {
-       die("skip ".$e->getMessage()); 
-}
-skip_online_test();
+skip_client_test();
 ?>
 --FILE--
 <?php
-echo "Test\n";
-
-$client1 = new http\Client;
-$client2 = new http\Client;
-
-$client1->enableEvents();
-$client2->enableEvents();
 
-$client1->enqueue(new http\Client\Request("GET", "http://www.google.ca/"));
-$client2->enqueue(new http\Client\Request("GET", "http://www.google.co.uk/"));
+include "helper/server.inc";
 
-$client1->send();
-
-if (($r = $client1->getResponse())) {
-       var_dump($r->getTransferInfo("response_code"));
-}
-if (($r = $client2->getResponse())) {
-       var_dump($r->getTransferInfo("response_code"));
-}
+echo "Test\n";
 
+server("proxy.inc", function($port) {
+       $client1 = new http\Client;
+       $client2 = new http\Client;
+       
+       $client1->configure(array("use_eventloop" => true));
+       $client2->configure(array("use_eventloop" => true));
+       
+       $client1->enqueue(new http\Client\Request("GET", "http://localhost:$port/"));
+       $client2->enqueue(new http\Client\Request("GET", "http://localhost:$port/"));
+       
+       $client1->send();
+       
+       if (($r = $client1->getResponse())) {
+               var_dump($r->getTransferInfo("response_code"));
+       }
+       if (($r = $client2->getResponse())) {
+               var_dump($r->getTransferInfo("response_code"));
+       }
+       
+});
 ?>
 DONE
 --EXPECT--