X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Frequestpool001.phpt;h=790823c7310fac3d4f1715079a44653976b1489c;hb=6cc24086f57aa1e8f4d6a2c12361635e7c24f60f;hp=3ca16837c7e4fdaebc48f2030235cfa706ea539a;hpb=fa54d3dd8c0f101c9f8619d59eaf1940c311e7e5;p=m6w6%2Fext-http

diff --git a/tests/requestpool001.phpt b/tests/requestpool001.phpt
index 3ca1683..790823c 100644
--- a/tests/requestpool001.phpt
+++ b/tests/requestpool001.phpt
@@ -9,9 +9,8 @@ include 'skipif.inc';
 
 use http\request\Factory as HttpRequestFactory;
 use http\request\Pool as HttpRequestPool;
-use http\request\Method as HttpRequestMethod;
-use http\RequestException as HttpRequestException;
-use http\SocketException as HttpSocketException;
+use http\Exception as HttpRequestException;
+use http\Exception as HttpSocketException;
 
 echo "-TEST\n";
 
@@ -53,7 +52,7 @@ class Pool extends HttpRequestPool
 			$this->attach(
 				$this->factory->createRequest(
 					$url,
-					HttpRequestMethod::GET,
+					"GET",
 					array(
 						'redirect'	=> 5,
 						'compress'  => GZIP,
@@ -87,7 +86,12 @@ class Pool extends HttpRequestPool
 			
 			$u = $r->getUrl();
 			$c = $r->getResponseCode();
-			$b = $r->getResponseBody();
+            try {
+    			$b = $r->getResponseBody();
+            } catch (\Exception $e) {
+                echo $e->getMessage(), "\n";
+                $b = "";
+            }
 			
 			printf("%d %s %d\n", $c, $u, strlen($b));
 			
@@ -100,7 +104,7 @@ class Pool extends HttpRequestPool
 				$this->attach(
 					$this->factory->createRequest(
 						$url,
-						HttpRequestMethod::GET,
+						"GET",
 						array(
 							'redirect'	=> 5,
 							'compress'	=> GZIP,
@@ -117,12 +121,12 @@ class Pool extends HttpRequestPool
 }
 
 define('GZIP', true);
-define('TOUT', 50);
+define('TOUT', 300);
 define('RMAX', 10);
 chdir(__DIR__);
 
 $time = microtime(true);
-$factory = new HttpRequestFactory("curl", array("requestPoolClass" => "Pool"));
+$factory = new HttpRequestFactory(array("driver" => "curl", "requestPoolClass" => "Pool"));
 $factory->createPool()->run($factory);
 printf("Elapsed: %0.3fs\n", microtime(true)-$time);