Skip to content

Commit cd927ef

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Always skip randomly failing OCI8 extauth tests
2 parents 71e198b + 9a73ec0 commit cd927ef

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

ext/oci8/tests/extauth_01.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ oci8
55
--SKIPIF--
66
<?php
77
if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms");
8-
require(__DIR__.'/details.inc');
9-
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
8+
die("skip random CI timeouts caused by Oracle Instant Client, see https://github.com/php/php-src/pull/9524#issuecomment-1244409815");
109
?>
1110
--INI--
1211
oci8.privileged_connect=1

ext/oci8/tests/extauth_02.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Test External Authentication errors with oci_new_connect
44
oci8
55
--SKIPIF--
66
<?php
7-
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
87
if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms");
8+
die("skip random CI timeouts caused by Oracle Instant Client, see https://github.com/php/php-src/pull/9524#issuecomment-1244409815");
99
?>
1010
--INI--
1111
oci8.privileged_connect=1

ext/oci8/tests/extauth_03.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Test External Authentication errors with oci_pconnect
44
oci8
55
--SKIPIF--
66
<?php
7-
if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
87
if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms");
8+
die("skip random CI timeouts caused by Oracle Instant Client, see https://github.com/php/php-src/pull/9524#issuecomment-1244409815");
99
?>
1010
--INI--
1111
oci8.privileged_connect=1

ext/oci8/tests/extauth_04.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ oci8
66
<?php
77
if (substr(PHP_OS, 0, 3) != 'WIN') die("skip this test is for Windows platforms only");
88
?>
9+
--INI--
10+
oci8.privileged_connect=1
911
--FILE--
1012
<?php
1113

12-
// Run Test
13-
1414
echo "Test 1\n";
1515

1616
$c = oci_connect('/', '', 'anything', null, OCI_CRED_EXT);

0 commit comments

Comments
 (0)