From 9a73ec03677b7c8a988fdef539ac9b0e69f8ea25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Mon, 12 Sep 2022 22:53:15 +0200
Subject: [PATCH] Always skip randomly failing OCI8 extauth tests

This might be caused by an issue with the Oracle Instant Client
libraries[1]; we skip the tests for the time being.

[1] <https://github.com/php/php-src/pull/9524#issuecomment-1244409815>

Closes GH-9524.
---
 ext/oci8/tests/extauth_01.phpt | 5 +----
 ext/oci8/tests/extauth_02.phpt | 4 +---
 ext/oci8/tests/extauth_03.phpt | 4 +---
 ext/oci8/tests/extauth_04.phpt | 4 ++--
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/ext/oci8/tests/extauth_01.phpt b/ext/oci8/tests/extauth_01.phpt
index db23097d82d..00c94b67c0d 100644
--- a/ext/oci8/tests/extauth_01.phpt
+++ b/ext/oci8/tests/extauth_01.phpt
@@ -4,16 +4,13 @@ Test External Authentication errors with oci_connect
 <?php
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms");
-require(__DIR__.'/details.inc');
-if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
+die("skip random CI timeouts caused by Oracle Instant Client, see https://github.com/php/php-src/pull/9524#issuecomment-1244409815");
 ?>
 --INI--
 oci8.privileged_connect=1
 --FILE--
 <?php
 
-// Run Test
-
 echo "Test 1\n";
 
 $c = oci_connect('/', 'notemtpy', 'anything', null, OCI_CRED_EXT);
diff --git a/ext/oci8/tests/extauth_02.phpt b/ext/oci8/tests/extauth_02.phpt
index c8c3dd67253..1cb283740d1 100644
--- a/ext/oci8/tests/extauth_02.phpt
+++ b/ext/oci8/tests/extauth_02.phpt
@@ -3,16 +3,14 @@ Test External Authentication errors with oci_new_connect
 --SKIPIF--
 <?php
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
-if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
 if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms");
+die("skip random CI timeouts caused by Oracle Instant Client, see https://github.com/php/php-src/pull/9524#issuecomment-1244409815");
 ?>
 --INI--
 oci8.privileged_connect=1
 --FILE--
 <?php
 
-// Run Test
-
 echo "Test 1\n";
 
 $c = oci_new_connect('/', 'notemtpy', 'anything', null, OCI_CRED_EXT);
diff --git a/ext/oci8/tests/extauth_03.phpt b/ext/oci8/tests/extauth_03.phpt
index 863f94499b4..b611a645247 100644
--- a/ext/oci8/tests/extauth_03.phpt
+++ b/ext/oci8/tests/extauth_03.phpt
@@ -3,16 +3,14 @@ Test External Authentication errors with oci_pconnect
 --SKIPIF--
 <?php
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
-if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
 if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms");
+die("skip random CI timeouts caused by Oracle Instant Client, see https://github.com/php/php-src/pull/9524#issuecomment-1244409815");
 ?>
 --INI--
 oci8.privileged_connect=1
 --FILE--
 <?php
 
-// Run Test
-
 echo "Test 1\n";
 
 $c = oci_pconnect('/', 'notemtpy', 'anything', null, OCI_CRED_EXT);
diff --git a/ext/oci8/tests/extauth_04.phpt b/ext/oci8/tests/extauth_04.phpt
index 5f4e64fc84a..c0a609061c9 100644
--- a/ext/oci8/tests/extauth_04.phpt
+++ b/ext/oci8/tests/extauth_04.phpt
@@ -5,11 +5,11 @@ Test External Authentication errors on Windows
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 if (substr(PHP_OS, 0, 3) != 'WIN') die("skip this test is for Windows platforms only");
 ?>
+--INI--
+oci8.privileged_connect=1
 --FILE--
 <?php
 
-// Run Test
-
 echo "Test 1\n";
 
 $c = oci_connect('/', '', 'anything', null, OCI_CRED_EXT);