php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Same as for ext/mysqli tests: addition of a new environment variable

Browse Source 
MYSQL_TEST_SKIP_CONNECT_FAILURE  which controls how to deal with connection
problems. If MYSQL_TEST_SKIP_CONNECT_FAILURE = false (default) connection
problems will make a test fail. If you set MYSQL_TEST_SKIP_CONNECT_FAILURE
to any value that evaluates to true in PHP, a test which cannot connect to
the database will be skipped.
This commit is contained in:
Ulf Wendel
2007-08-09 11:53:17 +00:00
parent a166bd39ac
commit fb4967900d
37 changed files with 160 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/mysql/tests/mysql_fetch_array.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_array()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once "connect.inc";
ext/mysql/tests/mysql_fetch_assoc.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_assoc()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_fetch_field.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_field()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_fetch_lengths.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_lengths()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_fetch_object.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_object()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_fetch_row.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_fetch_row()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_field_flags.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_field_flags()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_field_len.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_field_len()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_field_name.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_field_name()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_field_seek.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_field_seek()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_field_table.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_field_table()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_field_type.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_field_type()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_free_result.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_free_result()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_get_host_info.phpt
+5 -2
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_get_host_info()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once "connect.inc";
@@ -34,4 +37,4 @@ if (!is_null($tmp = @mysql_get_host_info($link, "too many arguments"))) {
print "done!";
?>
--EXPECTF--
done!
done!
ext/mysql/tests/mysql_get_proto_info.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_get_proto_info()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once "connect.inc";
ext/mysql/tests/mysql_get_server_info.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_get_server_info()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_info.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_info()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_insert_id.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_insert_id()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_list_dbs.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_list_dbs()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once "connect.inc";
ext/mysql/tests/mysql_list_fields.phpt
+6 -4
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_list_fields()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once "connect.inc";
@@ -9,11 +12,10 @@ include_once "connect.inc";
$tmp = NULL;
$link = NULL;
if (false !== ($tmp = mysql_list_fields($link, $link)))
if (false !== ($tmp = @mysql_list_fields($link, $link)))
printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
require('table.inc');
if (!$res = mysql_list_fields($db, 'test', $link))
printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
@@ -23,7 +25,7 @@ if (!($num = mysql_num_fields($res)))
mysql_free_result($res);
mysql_close($link);
print "done!\n";
print "done!";
?>
--EXPECTF--
done!
ext/mysql/tests/mysql_list_processes.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_list_processes()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_list_tables.phpt
+3 -2
View File
@@ -1,8 +1,9 @@
--TEST--
mysql_list_tables()
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
ext/mysql/tests/mysql_num_fields.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_num_fields()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_num_rows.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_num_rows()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_pconnect.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_pconnect()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_phpinfo.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
phpinfo() mysql section
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once("connect.inc");
ext/mysql/tests/mysql_ping.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_ping()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once "connect.inc";
ext/mysql/tests/mysql_query.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_query()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once("connect.inc");
ext/mysql/tests/mysql_real_escape_string.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_real_escape_string()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_result.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_result()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_select_db.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_select_db()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once "connect.inc";
ext/mysql/tests/mysql_set_charset.phpt
+1
View File
@@ -3,6 +3,7 @@ mysql_set_charset() - STUB, function usage not recommended
--SKIPIF--
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
if (!function_exists('mysql_set_charset'))
die("skip Function not available");
?>
ext/mysql/tests/mysql_stat.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_stat()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once "connect.inc";
ext/mysql/tests/mysql_tablename.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_tablename()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
ext/mysql/tests/mysql_thread_id.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_thread_id()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once "connect.inc";
ext/mysql/tests/mysql_unbuffered_query.phpt
+4 -1
View File
@@ -1,7 +1,10 @@
--TEST--
mysql_unbuffered_query()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include_once("connect.inc");
ext/mysql/tests/skipifconnectfailure.inc
Executable
+17
View File
@@ -0,0 +1,17 @@
<?php
$skip_on_connect_failure = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ? getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") : false;
if ($skip_on_connect_failure) {
if ($socket)
$myhost = sprintf("%s:%s", $host, $socket);
else if ($port)
$myhost = sprintf("%s:%s", $host, $port);
if (!$link = @mysql_connect($myhost, $user, $passwd, true))
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysql_errno(), mysql_error()));
if (!@mysql_select_db($db, $link))
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysql_errno(), mysql_error()));
mysql_close($link);
}
?>