sixd                                     Thu, 08 Sep 2011 17:40:15 +0000

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

Log:
Fix skipifs to match other tests for the case when connection fails

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 mysqli_connect()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
 --FILE--
 <?php
 	require_once("connect.inc");
@@ -146,7 +149,7 @@
 	print "done!";
 ?>
 --EXPECTF--
-Warning: mysqli_connect(): (%d/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
+Warning: mysqli_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
 array(1) {
   [%u|b%"testing"]=>
   %unicode|string%(21) "mysqli.default_socket"

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 new mysqli()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
 --FILE--
 <?php
 	require_once("connect.inc");
@@ -144,7 +147,7 @@
 	print "done!";
 ?>
 --EXPECTF--
-Warning: mysqli::mysqli(): (%d/%d): Access denied for user '%sunknown%s'@'%s' (using password: %s) in %s on line %d
+Warning: mysqli::mysqli(): (%s/%d): Access denied for user '%sunknown%s'@'%s' (using password: %s) in %s on line %d
 ... and now Exceptions
 Access denied for user '%s'@'%s' (using password: %s)
 done!
\ No newline at end of file

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	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 new mysqli()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
 --FILE--
 <?php
 	require_once("connect.inc");

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_debug_ini.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_debug_ini.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_debug_ini.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -4,6 +4,7 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');

 if (!function_exists('mysqli_debug'))
  	die("skip mysqli_debug() not available");

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 mysqli_connect()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
 --FILE--
 <?php
 	require_once("connect.inc");

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect_oo.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect_oo.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect_oo.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 new mysqli()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
 --FILE--
 <?php
 	require_once("connect.inc");

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 new mysqli()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
 --FILE--
 <?php
 	require_once("connect.inc");

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_debug_ini.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_debug_ini.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_debug_ini.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -4,6 +4,7 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');

 if (!function_exists('mysqli_debug'))
  	die("skip mysqli_debug() not available");

Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_connect.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_connect.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_connect.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 mysqli_connect()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
 --FILE--
 <?php
 	require_once("connect.inc");

Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 new mysqli()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
 --FILE--
 <?php
 	require_once("connect.inc");

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	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 new mysqli()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
 --FILE--
 <?php
 	require_once("connect.inc");

Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_debug_ini.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_debug_ini.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_debug_ini.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -4,6 +4,7 @@
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');

 if (!function_exists('mysqli_debug'))
  	die("skip mysqli_debug() not available");
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to