Improve test portability

diff --git a/ext/oci8/tests/calltimeout1.phpt b/ext/oci8/tests/calltimeout1.phpt
index acc25c224abbdde0d186cfa8f65ff0e9e7fb6aa3..4411ed0f2c339dea8b46baa75336adbb85dd5d69 100755 (executable)
--- 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 30709c9e36b3fff0b010fc56f8d939c144e93b25..8710149911b149edc7e833a9440d1bfff81feee1 100644 (file)
--- 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
 }