From: Christopher Jones <christopher.jones@oracle.com>
Date: Sun, 9 Dec 2018 23:16:15 +0000 (+1100)
Subject: Improve test portability
X-Git-Tag: php-7.2.14RC1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4d894edb3a55180bca3bee41d99c3aa6df74cfd;p=php

Improve test portability
---

diff --git a/ext/oci8/tests/calltimeout1.phpt b/ext/oci8/tests/calltimeout1.phpt
index acc25c224a..4411ed0f2c 100755
--- a/ext/oci8/tests/calltimeout1.phpt
+++ b/ext/oci8/tests/calltimeout1.phpt
@@ -42,16 +42,10 @@ echo "Test 1\n";
 oci_set_call_timeout($c, 4000);  // milliseconds
 $r = mysleep($c, 8);             // seconds
 
-echo "Test 2\n";
-oci_set_call_timeout($c, 0);
-$r = mysleep($c, 5);
-
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
 Test 1
 Execute error was ORA-03136: %s
-Test 2
-Execute error was ORA-03114: %s
 ===DONE===
diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt
index 30709c9e36..8710149911 100644
--- a/ext/oci8/tests/db_op_2.phpt
+++ b/ext/oci8/tests/db_op_2.phpt
@@ -46,7 +46,7 @@ echo "Test 2\n";
 oci_set_db_operation($c, "");
 dq($c, 'select /*+ MONITOR */ \'dboptest\' from dual');
 
-dq($c, 'select sql_text, dbop_name from v$sql_monitor where sql_text like \'%dboptest2%\' order by dbop_exec_id desc');
+dq($c, 'select sql_text, dbop_name from v$sql_monitor where sql_text like \'%dboptest%\' order by dbop_exec_id desc');
 
 ?>
 ===DONE===
@@ -72,7 +72,7 @@ array(1) {
 }
 array(2) {
   ["SQL_TEXT"]=>
-  string(121) "select /*+ MONITOR */ sql_text, dbop_name from v$sql_monitor where sql_text like '%dboptest2%' order by dbop_exec_id desc"
+  string(42) "select /*+ MONITOR */ 'dboptest' from dual"
   ["DBOP_NAME"]=>
   NULL
 }