X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=tests%2Fclient031.phpt;fp=tests%2Fclient031.phpt;h=73ce7e4c6251cb5ae5147d5b422cfeab1c0c7a66;hp=32117356b62190f080ad817b00cbc613d7bd9309;hb=f3b5b84017131e5354aacaa01836d317dad38686;hpb=c05c9593fc7b7a0025e78517671cc0c5759bed4b

diff --git a/tests/client031.phpt b/tests/client031.phpt
index 3211735..73ce7e4 100644
--- a/tests/client031.phpt
+++ b/tests/client031.phpt
@@ -16,32 +16,29 @@ echo "Test\n";
 server("cookie.inc", function($port) {
 	$client = new http\Client(null, "cookies");
 	$client->configure(array("share_cookies" => false));
+
 	$request = new http\Client\Request("GET", "http://localhost:$port");
 	$client->enqueue($request);
 	$client->send();
-	while (($r = $client->getResponse())) {
-		dump_headers(null, $r->getHeaders());
-	}
+	dump_responses($client, ["counter" => 1]);
+
 	/* requeue the previous request */
 	$client->requeue($request);
-	$request = new http\Client\Request("GET", "http://localhost:$port");
-	$client->enqueue($request);
-	$client->send();
-	while (($r = $client->getResponse())) {
-		dump_headers(null, $r->getHeaders());
-	}
-	$request = new http\Client\Request("GET", "http://localhost:$port");
-	$client->enqueue($request);
 	$client->send();
-	while (($r = $client->getResponse())) {
-		dump_headers(null, $r->getHeaders());
+	dump_responses($client, ["counter" => 2]);
+
+	for($i = 0; $i < 3; ++$i) {
+		/* new requests */
+		$request = new http\Client\Request("GET", "http://localhost:$port");
+		$client->enqueue($request);
+		$client->send();
+		dump_responses($client, ["counter" => 1]);
 	}
-	$request = new http\Client\Request("GET", "http://localhost:$port");
-	$client->enqueue($request);
+
+	/* requeue the previous request */
+	$client->requeue($request);
 	$client->send();
-	while (($r = $client->getResponse())) {
-		dump_headers(null, $r->getHeaders());
-	}
+	dump_responses($client, ["counter" => 2]);
 });
 
 ?>
@@ -53,11 +50,11 @@ Set-Cookie: counter=1;
 X-Original-Transfer-Encoding: chunked
 
 Etag: ""
-Set-Cookie: counter=1;
+Set-Cookie: counter=2;
 X-Original-Transfer-Encoding: chunked
 
 Etag: ""
-Set-Cookie: counter=2;
+Set-Cookie: counter=1;
 X-Original-Transfer-Encoding: chunked
 
 Etag: ""
@@ -68,4 +65,8 @@ Etag: ""
 Set-Cookie: counter=1;
 X-Original-Transfer-Encoding: chunked
 
+Etag: ""
+Set-Cookie: counter=2;
+X-Original-Transfer-Encoding: chunked
+
 ===DONE===