fix tests

diff --git a/tests/client010.phpt b/tests/client010.phpt
index 7563a7760246250be341a47de3c248e6c74e9d81..803403f4686366fb78fc83728b07f39cdcb908a6 100644 (file)
--- a/tests/client010.phpt
+++ b/tests/client010.phpt
@@ -8,29 +8,32 @@ include "skipif.inc";
 <?php
 echo "Test\n";
 
 <?php
 echo "Test\n";
 

-$request = new http\Client\Request("POST", "http://dev.iworks.at/ext-http/.print_request.php");
-$request->getBody()->addForm(null, array("file"=>__FILE__, "name"=>"upload", "type"=>"text/plain"));
-
-foreach (http\Client::getAvailableDrivers() as $driver) {
-       $client = new http\Client($driver);
-       $client->enqueue($request)->send();
-       var_dump($client->getResponse()->getBody()->toString());
-}
-?>
-Done
---EXPECTREGEX--
-Test
-(?:string\(\d+\) "Array
+$RE =
+'/(Array

 \(
     \[upload\] \=\> Array
         \(
             \[name\] \=\> client010\.php
             \[type\] \=\> text\/plain
 \(
     \[upload\] \=\> Array
         \(
             \[name\] \=\> client010\.php
             \[type\] \=\> text\/plain

-            \[tmp_name\] \=\> .*
+            \[tmp_name\] \=\> .+

             \[error\] \=\> 0
             \[size\] \=\> \d+
         \)
 
 \)
             \[error\] \=\> 0
             \[size\] \=\> \d+
         \)
 
 \)

-"
-)+Done
+)+/';
+$request = new http\Client\Request("POST", "http://dev.iworks.at/ext-http/.print_request.php");
+$request->getBody()->addForm(null, array("file"=>__FILE__, "name"=>"upload", "type"=>"text/plain"));
+
+foreach (http\Client::getAvailableDrivers() as $driver) {
+       $client = new http\Client($driver);
+       $client->enqueue($request)->send();
+       if (!preg_match($RE, $s = $client->getResponse()->getBody()->toString())) {
+               echo($s);
+       }
+}
+?>
+Done
+--EXPECT--
+Test
+Done
\ No newline at end of file

diff --git a/tests/envresponse003.phpt b/tests/envresponse003.phpt
index 3bbf760c7dc77b69ce8212358504ec682f7ac77e..7a02814c27c5b5ea60ecfbeee42ba1c917ecb5da 100644 (file)
--- a/tests/envresponse003.phpt
+++ b/tests/envresponse003.phpt
@@ -18,7 +18,7 @@ $r->setBody(new http\Message\Body(fopen(__FILE__, "rb")));
 $r->send();
 
 ?>
 $r->send();
 
 ?>

---EXPECTHEADERS--
-Content-Type: text/plain
+--EXPECTHEADERSF--
+Content-Type: text/plain%s

 --EXPECTF--
 php
 --EXPECTF--
 php

diff --git a/tests/envresponseheader001.phpt b/tests/envresponseheader001.phpt
index 194f7d78f811928b4440eb55d94320c2835caebe..e03320fc1ce121d1159faef9ef7ba7683a497dc2 100644 (file)
--- a/tests/envresponseheader001.phpt
+++ b/tests/envresponseheader001.phpt
@@ -34,6 +34,6 @@ Array
             [2] => good
         )
 
             [2] => good
         )
 

-    [Content-Type] => text/html
+    [Content-Type] => text/html%s

 )
 Created
 )
 Created

diff --git a/tests/etag001.phpt b/tests/etag001.phpt
index b3a2a5347fbe4207dc2425604e578a8e88805e96..c1e1e44c897a92587198dcab8fd16bb1bf156703 100644 (file)
--- a/tests/etag001.phpt
+++ b/tests/etag001.phpt
@@ -11,7 +11,12 @@ version_compare(PHP_VERSION, "5.4.0", ">=") or die("skip PHP>=5.4 required");
 $body = new http\Message\Body;
 $body->append("Hello, my old fellow.");
 foreach (hash_algos() as $algo) {
 $body = new http\Message\Body;
 $body->append("Hello, my old fellow.");
 foreach (hash_algos() as $algo) {

-       if ($algo == "gost-crypto") continue;
+    switch ($algo) {
+    case "gost-crypto":
+    case "fnv1a32":
+    case "fnv1a64":
+        continue 2;
+    }

     ini_set("http.etag.mode", $algo);
     printf("%10s: %s\n", 
         $algo, 
     ini_set("http.etag.mode", $algo);
     printf("%10s: %s\n", 
         $algo,