Skip to content

Commit 1855a57

Browse files
author
Ulf Wendel
committed
Introducing new environment variable:
 MYSQL_TEST_SKIP_CONNECT_FAILURE = false Every test that needs a working MySQL connection now includes skipifconnectfailure.inc. If MYSQL_TEST_SKIP_CONNECT_FAILURE evaluates to true skipifconnectfailure.inc tries to establish a database connection. If no connection can be opened, the test will be skipped. In case of MYSQL_TEST_SKIP_CONNECT_FAILURE = false (default) an no connection, a test who cannot establish a connection will fail. So, if you have a buggy configuration or a server that is sometimes not available, you can now decide if you want the tests to ignore this and skip the test or to fail (MYSQL_TEST_CONNECT_FAILURE = false, default). Other, minor tweaks: 042.phpt - whitespace 067.phpt - parse error in SKIPIF section fixed
1 parent 6cb8910 commit 1855a57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+293
-83
lines changed

‎ext/mysqli/tests/001.phpt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
--TEST--
22
mysqli connect
33
--SKIPIF--
4-
<?php require_once('skipif.inc'); ?>
5-
<?php require_once('skipifemb.inc'); ?>
4+
<?php
5+
require_once('skipif.inc');
6+
require_once('skipifemb.inc');
7+
require_once('skipifconnectfailure.inc');
8+
?>
69
--FILE--
710
<?php
811
include "connect.inc";

‎ext/mysqli/tests/002.phpt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
mysqli bind_result 1
33
--SKIPIF--
4-
<?php require_once('skipif.inc'); ?>
4+
<?php
5+
require_once('skipif.inc');
6+
require_once('skipifconnectfailure.inc');
7+
?>
58
--FILE--
69
<?php
710
include "connect.inc";

‎ext/mysqli/tests/003.phpt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
mysqli connect
33
--SKIPIF--
4-
<?php require_once('skipif.inc'); ?>
4+
<?php
5+
require_once('skipif.inc');
6+
require_once('skipifconnectfailure.inc');
7+
?>
58
--FILE--
69
<?php
710
include "connect.inc";

‎ext/mysqli/tests/004.phpt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
mysqli fetch char/text
33
--SKIPIF--
4-
<?php require_once('skipif.inc'); ?>
4+
<?php
5+
require_once('skipif.inc');
6+
require_once('skipifconnectfailure.inc');
7+
?>
58
--FILE--
69
<?php
710
include ("connect.inc");

‎ext/mysqli/tests/005.phpt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
mysqli fetch char/text long
33
--SKIPIF--
4-
<?php require_once('skipif.inc'); ?>
4+
<?php
5+
require_once('skipif.inc');
6+
require_once('skipifconnectfailure.inc');
7+
?>
58
--FILE--
69
<?php
710
include "connect.inc";

‎ext/mysqli/tests/006.phpt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
mysqli fetch long values
33
--SKIPIF--
4-
<?php require_once('skipif.inc'); ?>
4+
<?php
5+
require_once('skipif.inc');
6+
require_once('skipifconnectfailure.inc');
7+
?>
58
--FILE--
69
<?php
710
include "connect.inc";

‎ext/mysqli/tests/007.phpt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
mysqli fetch short values
33
--SKIPIF--
4-
<?php require_once('skipif.inc'); ?>
4+
<?php
5+
require_once('skipif.inc');
6+
require_once('skipifconnectfailure.inc');
7+
?>
58
--FILE--
69
<?php
710
include "connect.inc";

‎ext/mysqli/tests/008.phpt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
mysqli fetch tinyint values
33
--SKIPIF--
4-
<?php require_once('skipif.inc'); ?>
4+
<?php
5+
require_once('skipif.inc');
6+
require_once('skipifconnectfailure.inc');
7+
?>
58
--FILE--
69
<?php
710
include "connect.inc";

‎ext/mysqli/tests/009.phpt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ mysqli fetch bigint values (ok to fail with 4.1.x)
77
exit;
88
}
99
require_once('skipif.inc');
10+
require_once('skipifconnectfailure.inc');
1011
?>
1112
--FILE--
1213
<?php

‎ext/mysqli/tests/010.phpt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ mysqli fetch float values
33
--INI--
44
precision=12
55
--SKIPIF--
6-
<?php require_once('skipif.inc'); ?>
6+
<?php
7+
require_once('skipif.inc');
8+
require_once('skipifconnectfailure.inc');
9+
?>
710
--FILE--
811
<?php
912
include "connect.inc";

0 commit comments

Comments
 (0)