uw                                       Tue, 22 Sep 2009 08:42:44 +0000

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

Log:
Fixing test

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_connect.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_connect.phpt      
2009-09-22 08:22:29 UTC (rev 288554)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_connect.phpt      
2009-09-22 08:42:44 UTC (rev 288555)
@@ -161,12 +161,13 @@
                        printf("[025] Usage of mysqli.default_host=p: did not 
fail\n") ;
                        mysqli_close($link);
                }
+               @mysqli_close($link);
        }

        @var_dump($link);

-       if (NULL === ($tmp = mysqli_real_connect($link, $host, $user, $passwd, 
$db, $port, $socket)))
-               printf("[026] Expecting not NULL, got %s/%s\n", gettype($tmp), 
$tmp);
+       if (NULL !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd, 
$db, $port, $socket)))
+               printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp), 
$tmp);

        print "done!";
 ?>
@@ -180,17 +181,17 @@
   [%u|b%"affected_rows"]=>
   NULL
   [%u|b%"client_info"]=>
-  %unicode|string%(%d) "%s"
+  %s
   [%u|b%"client_version"]=>
   int(%d)
   [%u|b%"connect_errno"]=>
   int(%d)
   [%u|b%"connect_error"]=>
-  %unicode|string%(%d) "%s"
+  %unicode|string%(%d) "%s
   [%u|b%"errno"]=>
-  int(%d)
+  %s
   [%u|b%"error"]=>
-  %unicode|string%(%d) "%s"
+  %s
   [%u|b%"field_count"]=>
   NULL
   [%u|b%"host_info"]=>
@@ -212,4 +213,6 @@
   [%u|b%"warning_count"]=>
   NULL
 }
-done!
+
+Warning: mysqli_real_connect(): Couldn't fetch mysqli in %s on line %d
+done!
\ No newline at end of file

Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_real_connect.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_real_connect.phpt 2009-09-22 
08:22:29 UTC (rev 288554)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_real_connect.phpt 2009-09-22 
08:42:44 UTC (rev 288555)
@@ -161,12 +161,13 @@
                        printf("[025] Usage of mysqli.default_host=p: did not 
fail\n") ;
                        mysqli_close($link);
                }
+               @mysqli_close($link);
        }

        @var_dump($link);

-       if (NULL === ($tmp = mysqli_real_connect($link, $host, $user, $passwd, 
$db, $port, $socket)))
-               printf("[026] Expecting not NULL, got %s/%s\n", gettype($tmp), 
$tmp);
+       if (NULL !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd, 
$db, $port, $socket)))
+               printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp), 
$tmp);

        print "done!";
 ?>
@@ -180,17 +181,17 @@
   [%u|b%"affected_rows"]=>
   NULL
   [%u|b%"client_info"]=>
-  %unicode|string%(%d) "%s"
+  %s
   [%u|b%"client_version"]=>
   int(%d)
   [%u|b%"connect_errno"]=>
   int(%d)
   [%u|b%"connect_error"]=>
-  %unicode|string%(%d) "%s"
+  %unicode|string%(%d) "%s
   [%u|b%"errno"]=>
-  int(%d)
+  %s
   [%u|b%"error"]=>
-  %unicode|string%(%d) "%s"
+  %s
   [%u|b%"field_count"]=>
   NULL
   [%u|b%"host_info"]=>
@@ -212,4 +213,6 @@
   [%u|b%"warning_count"]=>
   NULL
 }
-done!
+
+Warning: mysqli_real_connect(): Couldn't fetch mysqli in %s on line %d
+done!
\ No newline at end of file

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

Reply via email to