[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt

[Ulf Wendel]

uw   Mon, 31 May 2010 12:22:48 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=299984

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-05-31 12:10:04 UTC (rev 299983)
+++ 
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt   
2010-05-31 12:22:48 UTC (rev 299984)
@@ -33,7 +33,7 @@
$tmp = $res-fetch_assoc();
$res-free_result();

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

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-05-31 12:10:04 UTC (rev 299983)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt  
2010-05-31 12:22:48 UTC (rev 299984)
@@ -33,7 +33,7 @@
$tmp = $res-fetch_assoc();
$res-free_result();

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

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt

[Ulf Wendel]

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

Revision: http://svn.php.net/viewvc?view=revisionrevision=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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt

[Ulf Wendel]

uw   Wed, 04 Nov 2009 16:56:32 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=290210

Log:
mysqli won't accept empty string for socket, skip test of mysqli.default_socket 
if test run does not use socket

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   
2009-11-04 16:30:50 UTC (rev 290209)
+++ 
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt   
2009-11-04 16:56:32 UTC (rev 290210)
@@ -9,7 +9,11 @@

$tmp= NULL;
$link   = NULL;
-   ini_set('mysqli.default_socket', 'socket');
+
+   if ($socket != )
+   /* mysqli.default_socket requires non-empty string */
+   ini_set('mysqli.default_socket', 'socket');
+
ini_set('mysqli.default_port', );
ini_set('mysqli.default_pw', 'password');
ini_set('mysqli.default_user', 'user');
@@ -18,21 +22,23 @@
mysqli_report(MYSQLI_REPORT_OFF);
mysqli_report(MYSQLI_REPORT_STRICT);

-   ini_set('mysqli.default_socket', $socket);
-   try {
-   $mysqli = mysqli_init();
-   $mysqli-real_connect($host, $user, $passwd, $db, $port);
+   if ($socket != ) {
+   ini_set('mysqli.default_socket', $socket);
+   try {
+   $mysqli = mysqli_init();
+   $mysqli-real_connect($host, $user, $passwd, $db, 
$port);

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

-   $mysqli-close();
+   $mysqli-close();

-   } catch (mysqli_sql_exception $e) {
-   printf(%s\n, $e-getMessage());
-   printf([002] Usage of mysqli.default_socket failed\n);
+   } catch (mysqli_sql_exception $e) {
+   printf(%s\n, $e-getMessage());
+   printf([002] Usage of mysqli.default_socket failed\n);
+   }
}

ini_set('mysqli.default_port', $port);

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  
2009-11-04 16:30:50 UTC (rev 290209)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt  
2009-11-04 16:56:32 UTC (rev 290210)
@@ -9,7 +9,11 @@

$tmp= NULL;
$link   = NULL;
-   ini_set('mysqli.default_socket', 'socket');
+
+   if ($socket != )
+   /* mysqli.default_socket requires non-empty string */
+   ini_set('mysqli.default_socket', 'socket');
+
ini_set('mysqli.default_port', );
ini_set('mysqli.default_pw', 'password');
ini_set('mysqli.default_user', 'user');
@@ -18,21 +22,23 @@
mysqli_report(MYSQLI_REPORT_OFF);
mysqli_report(MYSQLI_REPORT_STRICT);

-   ini_set('mysqli.default_socket', $socket);
-   try {
-   $mysqli = mysqli_init();
-   $mysqli-real_connect($host, $user, $passwd, $db, $port);
+   if ($socket != ) {
+   ini_set('mysqli.default_socket', $socket);
+   try {
+   $mysqli = mysqli_init();
+   $mysqli-real_connect($host, $user, $passwd, $db, 
$port);

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

-   $mysqli-close();
+   $mysqli-close();

-   } catch (mysqli_sql_exception $e) {
-   printf(%s\n, $e-getMessage());
-   printf([002] Usage of mysqli.default_socket failed\n);
+   } catch (mysqli_sql_exception $e) {
+   printf(%s\n,