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

diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt
index cf7c7bede87fd384c996f3169596615e6be1c2e8..e14d88fe711939a1cb7359edb8452f7e8aba7d6e 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect.phpt
+++ b/ext/mysqli/tests/mysqli_connect.phpt
@@ -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 @@ mysqli_connect()
        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"

diff --git a/ext/mysqli/tests/mysqli_connect_oo.phpt b/ext/mysqli/tests/mysqli_connect_oo.phpt
index d406e24845d134abe7727ba6209c6a7bb21342e8..35cc1161644e7ec03aa743f354e229007f831d6f 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect_oo.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo.phpt
@@ -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 @@ new mysqli()
        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

diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
index bb643e8a307f4ea27e8f3b1cc48cd4aa4abb0063..1855a203143d79ef26b09af7327e418c7f6fb588 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
@@ -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");

diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt
index 859a44c32f25e040169e56607a093a6f26d990f8..bcf00672d6c1a913f3afecc28155e27d23297a3a 100644 (file)
--- a/ext/mysqli/tests/mysqli_debug_ini.phpt
+++ b/ext/mysqli/tests/mysqli_debug_ini.phpt
@@ -4,6 +4,7 @@ mysqli_debug() - enabling trace with ini setting
 <?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
        die("skip mysqli_debug() not available");