From: Christopher Jones <sixd@php.net>
Date: Thu, 8 Sep 2011 17:40:15 +0000 (+0000)
Subject: Fix skipifs to match other tests for the case when connection fails
X-Git-Tag: php-5.3.9RC1~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c809df001a94376fb11b75557f871960578bef4;p=php

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 cf7c7bede8..e14d88fe71 100644
--- 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 d406e24845..35cc116164 100644
--- 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 bb643e8a30..1855a20314 100644
--- 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 859a44c32f..bcf00672d6 100644
--- 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");