[PHP-CVS] cvs: php-src /ext/mysqli/tests mysqli_connect_oo_warnings.phpt

2009-05-29 Thread Ulf Wendel 
uw  Fri May 29 10:34:07 2009 UTC

  Modified files:  
/php-src/ext/mysqli/tests   mysqli_connect_oo_warnings.phpt 
  Log:
  Weaker test - libmysql/server error messages can differ by version
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
diff -u php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt:1.3 
php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt:1.4
--- php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt:1.3Thu Aug 
 9 10:10:46 2007
+++ php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phptFri May 29 
10:34:07 2009
@@ -44,14 +44,14 @@
 --EXPECTF--
 1) bail
 
-Warning: mysqli::mysqli(): (HY000/2005): Unknown MySQL server host '%s' (1) in 
%s on line %d
+Warning: mysqli::mysqli(): (HY000/200%d): %s
 2) be quiet
-%s(%d) Unknown MySQL server host '%s' (1)
-int(2005)
+%s(%d) %s
+int(200%d)
 3) bail
 
-Warning: mysqli_connect(): (HY000/2005): Unknown MySQL server host '%s' (1) in 
%s on line %d
+Warning: mysqli_connect(): (HY000/200%d): %s
 4) be quiet
-%s(%d) Unknown MySQL server host '%s' (1)
-int(2005)
+%s(%d) %s
+int(200%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

[PHP-CVS] cvs: php-src /ext/mysqli/tests mysqli_connect_oo_warnings.phpt

2007-08-09 Thread Ulf Wendel 
uw  Thu Aug  9 10:10:46 2007 UTC

  Modified files:  
/php-src/ext/mysqli/tests   mysqli_connect_oo_warnings.phpt 
  Log:
  No need for an extra skip*.inc file, this check is done in just one place
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
diff -u php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt:1.2 
php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt:1.2Thu Aug 
 9 10:01:19 2007
+++ php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phptThu Aug  9 
10:10:46 2007
@@ -5,7 +5,8 @@
require_once('skipif.inc');
require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
-   require_once('skipifnodefuser.inc');
+   if (!get_current_user())
+   die('skip: get_current_user() not supported');
if (stristr(mysqli_get_client_info(), 'mysqlnd'))
die(skip: test for libmysql (different error output when using 
php streams);
 ?

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