Skip to content

Commit 6866b45

Browse files
m6w6m6w6
committed
fix test concurrency
1 parent 002763f commit 6866b45

15 files changed

+37
-37
lines changed

‎ext/spl/tests/DirectoryIterator_getBasename_basic_test.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DirectoryIterator::getBasename() - Basic Test
44
PHPNW Testfest 2009 - Adrian Hardy
55
--FILE--
66
<?php
7-
$targetDir = __DIR__.DIRECTORY_SEPARATOR.md5('directoryIterator::getbasename');
7+
$targetDir = __DIR__.DIRECTORY_SEPARATOR.md5('directoryIterator::getbasename1');
88
mkdir($targetDir);
99
touch($targetDir.DIRECTORY_SEPARATOR.'getBasename_test.txt');
1010
$dir = new DirectoryIterator($targetDir.DIRECTORY_SEPARATOR);
@@ -15,7 +15,7 @@ PHPNW Testfest 2009 - Adrian Hardy
1515
?>
1616
--CLEAN--
1717
<?php
18-
$targetDir = __DIR__.DIRECTORY_SEPARATOR.md5('directoryIterator::getbasename');
18+
$targetDir = __DIR__.DIRECTORY_SEPARATOR.md5('directoryIterator::getbasename1');
1919
unlink($targetDir.DIRECTORY_SEPARATOR.'getBasename_test.txt');
2020
rmdir($targetDir);
2121
?>

‎ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DirectoryIterator::getBasename() - Pass unexpected array
44
PHPNW Testfest 2009 - Adrian Hardy
55
--FILE--
66
<?php
7-
$targetDir = __DIR__.DIRECTORY_SEPARATOR.md5('directoryIterator::getbasename');
7+
$targetDir = __DIR__.DIRECTORY_SEPARATOR.md5('directoryIterator::getbasename2');
88
mkdir($targetDir);
99
touch($targetDir.DIRECTORY_SEPARATOR.'getBasename_test.txt');
1010
$dir = new DirectoryIterator($targetDir.DIRECTORY_SEPARATOR);
@@ -15,7 +15,7 @@ PHPNW Testfest 2009 - Adrian Hardy
1515
?>
1616
--CLEAN--
1717
<?php
18-
$targetDir = __DIR__.DIRECTORY_SEPARATOR.md5('directoryIterator::getbasename');
18+
$targetDir = __DIR__.DIRECTORY_SEPARATOR.md5('directoryIterator::getbasename2');
1919
unlink($targetDir.DIRECTORY_SEPARATOR.'getBasename_test.txt');
2020
rmdir($targetDir);
2121
?>

‎ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pawel Krynicki <pawel [dot] krynicki [at] xsolve [dot] pl>
55
#testfest AmsterdamPHP 2012-06-23
66
--FILE--
77
<?php
8-
$depth0 = "depth0";
8+
$depth0 = "depth01";
99
$depth1 = 'depth1';
1010
$depth2 = 'depth2';
1111
$targetDir = __DIR__ . DIRECTORY_SEPARATOR . $depth0 . DIRECTORY_SEPARATOR . $depth1 . DIRECTORY_SEPARATOR . $depth2;
@@ -38,7 +38,7 @@ function rrmdir($dir) {
3838
rmdir($dir);
3939
}
4040

41-
$targetDir = __DIR__.DIRECTORY_SEPARATOR . "depth0";
41+
$targetDir = __DIR__.DIRECTORY_SEPARATOR . "depth01";
4242
rrmdir($targetDir);
4343
?>
4444

‎ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pawel Krynicki <pawel [dot] krynicki [at] xsolve [dot] pl>
55
#testfest AmsterdamPHP 2012-06-23
66
--FILE--
77
<?php
8-
$depth0 = "depth0";
8+
$depth0 = "depth02";
99
$depth1 = "depth1";
1010
$depth2 = "depth2";
1111
$targetDir = __DIR__ . DIRECTORY_SEPARATOR . $depth0 . DIRECTORY_SEPARATOR . $depth1 . DIRECTORY_SEPARATOR . $depth2;
@@ -41,7 +41,7 @@ function rrmdir($dir) {
4141
rmdir($dir);
4242
}
4343

44-
$targetDir = __DIR__ . DIRECTORY_SEPARATOR . "depth0";
44+
$targetDir = __DIR__ . DIRECTORY_SEPARATOR . "depth02";
4545
rrmdir($targetDir);
4646
?>
4747
--EXPECTF--

‎ext/spl/tests/SplFileObject_fgetcsv_basic.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fgetcsv default path
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv1.csv', 'w+');
66
fputcsv($fp, array(
77
'field1',
88
'field2',
@@ -11,12 +11,12 @@ fputcsv($fp, array(
1111
));
1212
fclose($fp);
1313

14-
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
14+
$fo = new SplFileObject('SplFileObject__fgetcsv1.csv');
1515
var_dump($fo->fgetcsv());
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('SplFileObject__fgetcsv.csv');
19+
unlink('SplFileObject__fgetcsv1.csv');
2020
?>
2121
--EXPECTF--
2222
array(4) {

‎ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fgetcsv with alternative delimiter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv2.csv', 'w+');
66
fputcsv($fp, array(
77
'field1',
88
'field2',
@@ -11,12 +11,12 @@ fputcsv($fp, array(
1111
), '|');
1212
fclose($fp);
1313

14-
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
14+
$fo = new SplFileObject('SplFileObject__fgetcsv2.csv');
1515
var_dump($fo->fgetcsv('|'));
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('SplFileObject__fgetcsv.csv');
19+
unlink('SplFileObject__fgetcsv2.csv');
2020
?>
2121
--EXPECTF--
2222
array(4) {

‎ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fgetcsv with alternative delimiter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv3.csv', 'w+');
66
fputcsv($fp, array(
77
'field1',
88
'field2',
@@ -11,12 +11,12 @@ fputcsv($fp, array(
1111
), '|');
1212
fclose($fp);
1313

14-
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
14+
$fo = new SplFileObject('SplFileObject__fgetcsv3.csv');
1515
var_dump($fo->fgetcsv('invalid'));
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('SplFileObject__fgetcsv.csv');
19+
unlink('SplFileObject__fgetcsv3.csv');
2020
?>
2121
--EXPECTF--
2222
Warning: SplFileObject::fgetcsv(): delimiter must be a character in %s on line %d

‎ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fgetcsv with alternative delimiter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv4.csv', 'w+');
66
fputcsv($fp, array(
77
'field1',
88
'field2',
@@ -11,12 +11,12 @@ fputcsv($fp, array(
1111
), ',', '"');
1212
fclose($fp);
1313

14-
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
14+
$fo = new SplFileObject('SplFileObject__fgetcsv4.csv');
1515
var_dump($fo->fgetcsv(',', '"'));
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('SplFileObject__fgetcsv.csv');
19+
unlink('SplFileObject__fgetcsv4.csv');
2020
?>
2121
--EXPECTF--
2222
array(4) {

‎ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fgetcsv with alternative delimiter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv5.csv', 'w+');
66
fputcsv($fp, array(
77
'field1',
88
'field2',
@@ -11,12 +11,12 @@ fputcsv($fp, array(
1111
), ',', '"');
1212
fclose($fp);
1313

14-
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
14+
$fo = new SplFileObject('SplFileObject__fgetcsv5.csv');
1515
var_dump($fo->fgetcsv(',', 'invalid'));
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('SplFileObject__fgetcsv.csv');
19+
unlink('SplFileObject__fgetcsv5.csv');
2020
?>
2121
--EXPECTF--
2222
Warning: SplFileObject::fgetcsv(): enclosure must be a character in %s on line %d

‎ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
SplFileObject::fgetcsv with alternative delimiter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv6.csv', 'w+');
66
fwrite($fp, '"aaa","b""bb","ccc"');
77
fclose($fp);
88

9-
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
9+
$fo = new SplFileObject('SplFileObject__fgetcsv6.csv');
1010
var_dump($fo->fgetcsv(',', '"', '"'));
1111
?>
1212
--CLEAN--
1313
<?php
14-
unlink('SplFileObject__fgetcsv.csv');
14+
unlink('SplFileObject__fgetcsv6.csv');
1515
?>
1616
--EXPECTF--
1717
array(3) {

‎ext/spl/tests/SplFileObject_fgetcsv_escape_default.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
SplFileObject::fgetcsv with default escape character
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv7.csv', 'w+');
66
fwrite($fp, '"aa\"","bb","\"c"');
77
fclose($fp);
88

9-
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
9+
$fo = new SplFileObject('SplFileObject__fgetcsv7.csv');
1010
var_dump($fo->fgetcsv());
1111
?>
1212
--CLEAN--
1313
<?php
14-
unlink('SplFileObject__fgetcsv.csv');
14+
unlink('SplFileObject__fgetcsv7.csv');
1515
?>
1616
--EXPECTF--
1717
array(3) {

‎ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
SplFileObject::fgetcsv with alternative delimiter
33
--FILE--
44
<?php
5-
$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
5+
$fp = fopen('SplFileObject__fgetcsv8.csv', 'w+');
66
fwrite($fp, '"aaa","b""bb","ccc"');
77
fclose($fp);
88

9-
$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
9+
$fo = new SplFileObject('SplFileObject__fgetcsv8.csv');
1010
var_dump($fo->fgetcsv(',', '"', 'invalid'));
1111
?>
1212
--CLEAN--
1313
<?php
14-
unlink('SplFileObject__fgetcsv.csv');
14+
unlink('SplFileObject__fgetcsv8.csv');
1515
?>
1616
--EXPECTF--
1717
Warning: SplFileObject::fgetcsv(): escape must be a character in %s on line %d

‎ext/spl/tests/SplFileObject_fputcsv_002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fputcsv(): Checking data after calling the function
33
--FILE--
44
<?php
5-
$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv.csv', 'w');
5+
$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv1.csv', 'w');
66

77
$data = array(1, 2, 'foo', 'haha', array(4, 5, 6), 1.3, null);
88

@@ -12,7 +12,7 @@ var_dump($data);
1212
?>
1313
--CLEAN--
1414
<?php
15-
$file = __DIR__ . '/SplFileObject_fputcsv.csv';
15+
$file = __DIR__ . '/SplFileObject_fputcsv1.csv';
1616
unlink($file);
1717
?>
1818
--EXPECTF--

‎ext/spl/tests/SplFileObject_fputcsv_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SplFileObject::fputcsv(): error conditions
33
--FILE--
44
<?php
5-
$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv.csv', 'w');
5+
$fo = new SplFileObject(__DIR__ . '/SplFileObject_fputcsv2.csv', 'w');
66

77
echo "*** Testing error conditions ***\n";
88
// zero argument
@@ -19,7 +19,7 @@ var_dump( $fo->fputcsv($fields, $delim, $enclosure, $fo) );
1919
echo "Done\n";
2020
--CLEAN--
2121
<?php
22-
$file = __DIR__ . '/SplFileObject_fputcsv.csv';
22+
$file = __DIR__ . '/SplFileObject_fputcsv2.csv';
2323
unlink($file);
2424
?>
2525
--EXPECTF--

‎ext/spl/tests/dit_006.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SPL: DirectoryIterator and seek
33
--FILE--
44
<?php
5-
$di = new DirectoryIterator(__DIR__);
5+
$di = new DirectoryIterator(__DIR__."/..");
66
$di->seek(2);
77

88
$n = 0;

0 commit comments

Comments
 (0)