Skip to content

Commit 9c1e1bb

Browse files
ptarjanTyrael
ptarjan
authored and
Tyrael
committed
fix many parallel test issues
While running these on HHVM I've run into a lot of parallelism issues. I'm backporting all the fixes I had to do in https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650 to php core. Most of these changes were just filenames that were shared between tests, but I did more surgery on the fixed ports. I can apreciate port 31337 as much as the next nerd, but random ports are better for tests.
1 parent c439ac6 commit 9c1e1bb

File tree

74 files changed

+185
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+185
-109
lines changed

‎ext/ftp/tests/ftp_fget_basic1.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ ftp_login($ftp, 'user', 'pass');
1616
if (!$ftp) die("Couldn't connect to the server");
1717
ftp_set_option($ftp, FTP_AUTOSEEK, false);
1818

19-
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
19+
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic1.txt";
2020
$handle = fopen($local_file, 'w');
2121

2222
var_dump(ftp_fget($ftp, $handle, 'fget.txt', FTP_ASCII, FTP_AUTORESUME));
2323
var_dump(file_get_contents($local_file));
2424
?>
2525
--CLEAN--
2626
<?php
27-
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
27+
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic1.txt");
2828
?>
2929
--EXPECT--
3030
bool(true)

‎ext/ftp/tests/ftp_fget_basic2.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
1515
ftp_login($ftp, 'user', 'pass');
1616
if (!$ftp) die("Couldn't connect to the server");
1717

18-
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
18+
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic2.txt";
1919
file_put_contents($local_file, 'ASCIIFoo');
2020
$handle = fopen($local_file, 'a');
2121

@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
2424
?>
2525
--CLEAN--
2626
<?php
27-
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
27+
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic2.txt");
2828
?>
2929
--EXPECT--
3030
bool(true)

‎ext/ftp/tests/ftp_fget_basic3.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
1515
ftp_login($ftp, 'user', 'pass');
1616
if (!$ftp) die("Couldn't connect to the server");
1717

18-
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
18+
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic3.txt";
1919
file_put_contents($local_file, 'ASCIIFoo');
2020
$handle = fopen($local_file, 'a');
2121

@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
2424
?>
2525
--CLEAN--
2626
<?php
27-
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
27+
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic3.txt");
2828
?>
2929
--EXPECT--
3030
bool(true)

‎ext/ftp/tests/ftp_nb_fget_basic1.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ ftp_login($ftp, 'user', 'pass');
1616
if (!$ftp) die("Couldn't connect to the server");
1717
ftp_set_option($ftp, FTP_AUTOSEEK, false);
1818

19-
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
19+
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic1.txt";
2020
$handle = fopen($local_file, 'w');
2121

2222
var_dump(ftp_nb_fget($ftp, $handle, 'fget.txt', FTP_ASCII, FTP_AUTORESUME));
2323
var_dump(file_get_contents($local_file));
2424
?>
2525
--CLEAN--
2626
<?php
27-
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
27+
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic1.txt");
2828
?>
2929
--EXPECT--
3030
int(2)

‎ext/ftp/tests/ftp_nb_fget_basic2.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
1515
ftp_login($ftp, 'user', 'pass');
1616
if (!$ftp) die("Couldn't connect to the server");
1717

18-
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
18+
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic2.txt";
1919
file_put_contents($local_file, 'ASCIIFoo');
2020
$handle = fopen($local_file, 'a');
2121

@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
2424
?>
2525
--CLEAN--
2626
<?php
27-
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
27+
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic2.txt");
2828
?>
2929
--EXPECT--
3030
int(2)

‎ext/ftp/tests/ftp_nb_fget_basic3.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
1515
ftp_login($ftp, 'user', 'pass');
1616
if (!$ftp) die("Couldn't connect to the server");
1717

18-
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
18+
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic3.txt";
1919
file_put_contents($local_file, 'ASCIIFoo');
2020
$handle = fopen($local_file, 'a');
2121

@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
2424
?>
2525
--CLEAN--
2626
<?php
27-
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
27+
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic3.txt");
2828
?>
2929
--EXPECT--
3030
int(2)

‎ext/ftp/tests/ftp_nb_get_large.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
1818
ftp_login($ftp, 'user', 'pass');
1919
if (!$ftp) die("Couldn't connect to the server");
2020

21-
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
21+
$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_get_large.txt";
2222
touch($local_file);
2323
ftp_nb_get($ftp, $local_file, 'fget_large.txt', FTP_BINARY, 5368709119);
2424
$fp = fopen($local_file, 'r');
@@ -29,7 +29,7 @@ fclose($fp);
2929
?>
3030
--CLEAN--
3131
<?php
32-
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
32+
@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_get_large.txt");
3333
?>
3434
--EXPECT--
3535
string(1) "X"

‎ext/spl/tests/SplFileObject_getflags_basic.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ Erwin Poeze <erwin.poeze@gmail.com>
77
--FILE--
88
<?php
99

10-
file_put_contents('testdata.csv', 'eerste;tweede;derde');
10+
file_put_contents('SplFileObject_getflags_basic.csv', 'eerste;tweede;derde');
1111

12-
$fo = new SplFileObject('testdata.csv');
12+
$fo = new SplFileObject('SplFileObject_getflags_basic.csv');
1313

1414
$fo->setFlags(SplFileObject::DROP_NEW_LINE);
1515
var_dump($fo->getFlags());
1616
?>
1717
--CLEAN--
1818
<?php
19-
unlink('testdata.csv');
19+
unlink('SplFileObject_getflags_basic.csv');
2020
?>
2121
--EXPECT--
2222
int(1)

‎ext/spl/tests/SplFileObject_getflags_error001.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Erwin Poeze <erwin.poeze@gmail.com>
77
--FILE--
88
<?php
99

10-
file_put_contents('testdata.csv', 'eerste;tweede;derde');
10+
file_put_contents('SplFileObject_getflags_error001.csv', 'eerste;tweede;derde');
1111

1212

13-
$fo = new SplFileObject('testdata.csv');
13+
$fo = new SplFileObject('SplFileObject_getflags_error001.csv');
1414
$fo->setFlags(SplFileObject::READ_CSV);
1515

1616
$fo->setFlags(SplFileObject::DROP_NEW_LINE);
@@ -20,7 +20,7 @@ var_dump($fo->getFlags());
2020
?>
2121
--CLEAN--
2222
<?php
23-
unlink('testdata.csv');
23+
unlink('SplFileObject_getflags_error001.csv');
2424
?>
2525
--EXPECT--
2626
int(1)

‎ext/spl/tests/SplFileObject_getflags_error002.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ Erwin Poeze <erwin.poeze@gmail.com>
55
--FILE--
66
<?php
77

8-
file_put_contents('testdata.csv', 'eerste;tweede;derde');
8+
file_put_contents('SplFileObject_getflags_error002.csv', 'eerste;tweede;derde');
99

10-
$fo = new SplFileObject('testdata.csv');
10+
$fo = new SplFileObject('SplFileObject_getflags_error002.csv');
1111
$fo->setFlags(SplFileObject::READ_CSV);
1212

1313
$fo->getFlags('fake');
1414

1515
?>
1616
--CLEAN--
1717
<?php
18-
unlink('testdata.csv');
18+
unlink('SplFileObject_getflags_error002.csv');
1919
?>
2020
--EXPECTF--
2121
Warning: SplFileObject::getFlags() expects exactly 0 parameters, 1 given in %s on line %d

0 commit comments

Comments
 (0)