uw                                       Mon, 04 Jan 2010 14:59:04 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=293084

Log:
Fixing test

Changed paths:
    U   
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
    U   php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt   
    2010-01-04 14:57:08 UTC (rev 293083)
+++ 
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt   
    2010-01-04 14:59:04 UTC (rev 293084)
@@ -30,9 +30,14 @@

                        if (!$res = $mysqli->query("SELECT 
'mysqli.default_socket' AS testing"))
                                printf("[001] [%d] %s\n", $mysqli->errno, 
$mysqli->error);
-                       var_dump($res->fetch_assoc());
+                       $tmp = $res->fetch_assoc();
                        $res->free_result();

+                       if (!isset($tmp['testing']) || $tmp['testing'] != 
$socket) {
+                               printf("[002] mysqli.default_socket not 
properly set?\n");
+                               var_dump($tmp);
+                       }
+
                        $mysqli->close();

                } catch (mysqli_sql_exception $e) {
@@ -151,10 +156,6 @@
 --EXPECTF--
 array(1) {
   [%u|b%"testing"]=>
-  %unicode|string%(21) "mysqli.default_socket"
-}
-array(1) {
-  [%u|b%"testing"]=>
   %unicode|string%(19) "mysqli.default_port"
 }
 array(1) {

Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt  
2010-01-04 14:57:08 UTC (rev 293083)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt  
2010-01-04 14:59:04 UTC (rev 293084)
@@ -30,9 +30,14 @@

                        if (!$res = $mysqli->query("SELECT 
'mysqli.default_socket' AS testing"))
                                printf("[001] [%d] %s\n", $mysqli->errno, 
$mysqli->error);
-                       var_dump($res->fetch_assoc());
+                       $tmp = $res->fetch_assoc();
                        $res->free_result();

+                       if (!isset($tmp['testing']) || $tmp['testing'] != 
$socket) {
+                               printf("[002] mysqli.default_socket not 
properly set?\n");
+                               var_dump($tmp);
+                       }
+
                        $mysqli->close();

                } catch (mysqli_sql_exception $e) {
@@ -151,10 +156,6 @@
 --EXPECTF--
 array(1) {
   [%u|b%"testing"]=>
-  %unicode|string%(21) "mysqli.default_socket"
-}
-array(1) {
-  [%u|b%"testing"]=>
   %unicode|string%(19) "mysqli.default_port"
 }
 array(1) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to