Skip to content

Commit ed2b456

Browse files
authored
Don't skip tests which are supposed to fail; mark them as xfail (#15472)
Especially regarding buggy server behavior, we should not skip those tests, because it is unlikely that fixes to the server's behavior will even be noticed. Instead we mark these tests as xfail, so we get a warning if the test succeeds, and can act appropriately.
1 parent 7a9120e commit ed2b456

4 files changed

+8
-5
lines changed

ext/mysqli/tests/mysqli_change_user_get_lock.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
die("skip - is the server still buggy?");
98
?>
9+
--XFAIL--
10+
The server is still buggy
1011
--INI--
1112
max_execution_time=240
1213
--FILE--

ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
die("skip - is the server still buggy?");
98
?>
9+
--XFAIL--
10+
The server is still buggy
1011
--FILE--
1112
<?php
1213
require_once 'connect.inc';

ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
die("SKIP: prefetch isn't supported at the moment");
98
?>
9+
--XFAIL--
10+
prefetch isn't supported at the moment
1011
--FILE--
1112
<?php
1213
require 'table.inc';

ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
9-
die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.php?id=42490");
108
?>
9+
--XFAIL--
10+
http://bugs.mysql.com/bug.php?id=42490
1111
--FILE--
1212
<?php
1313
require 'table.inc';

0 commit comments

Comments
 (0)