Skip to content

Commit 68dd8f2

Browse files
committed
These tests now work the same no matter the FB version
1 parent 0941be0 commit 68dd8f2

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

tests/ibase_trans_004.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ ibase_trans(): handles
33
--SKIPIF--
44
<?php
55
include("skipif.inc");
6-
// TODO: Further investigation needed.
76
// On FB2.5 server "invalid transaction handle" happens on fetch.
8-
// Related to tests/ibase_trans_012.phpt
9-
skip_if_fb_lt(3.0);
7+
// See also: tests/ibase_trans_012.phpt
8+
// skip_if_fb_lt(3.0);
109
?>
1110
--FILE--
1211
<?php
@@ -24,7 +23,7 @@ ibase_connect($test_base);
2423

2524
?>
2625
--EXPECTF--
27-
resource(12) of type (Firebird/InterBase transaction)
26+
resource(%d) of type (Firebird/InterBase transaction)
2827
bool(true)
2928
resource(%d) of type (Firebird/InterBase transaction)
3029

tests/ibase_trans_006.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ ibase_trans(): handles
44
<?php
55
include("skipif.inc");
66
// On FB2.5 server "invalid transaction handle" happens on fetch.
7-
// TODO: Further investigation needed.
8-
// Related to tests/ibase_trans_013.phpt
9-
skip_if_fb_lt(3.0);
7+
// See also: tests/ibase_trans_013.phpt
8+
// skip_if_fb_lt(3.0);
109
?>
1110
--FILE--
1211
<?php
1312

1413
require("interbase.inc");
15-
1614
ibase_connect($test_base);
1715

1816
(function() {

tests/ibase_trans_012.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ ibase_trans(): handles
33
--SKIPIF--
44
<?php
55
include("skipif.inc");
6-
// TODO: Further investigation needed.
76
// On FB2.5 server "invalid transaction handle" happens on fetch.
8-
// Related to tests/ibase_trans_004.phpt
9-
skip_if_fb_gt(2.5);
7+
// See also: tests/ibase_trans_004.phpt
8+
// skip_if_fb_gt(2.5);
9+
die("skip further investigation needed");
1010
?>
1111
--FILE--
1212
<?php

tests/ibase_trans_013.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ibase_trans(): handles
44
<?php
55
include("skipif.inc");
66
// On FB2.5 server "invalid transaction handle" happens on fetch.
7-
// TODO: Further investigation needed.
8-
// Related to tests/ibase_trans_013.phpt
7+
// See also: tests/ibase_trans_006.phpt
8+
die("skip further investigation needed");
99
skip_if_fb_gt(2.5);
1010
?>
1111
--FILE--

0 commit comments

Comments
 (0)