diff options
| author | ptarjan <ptarjan@fb.com> | 2013-09-26 00:18:05 -0700 |
|---|---|---|
| committer | ptarjan <ptarjan@fb.com> | 2013-09-26 00:30:23 -0700 |
| commit | ecbe4af0de94c629fa5ba8ab169654e00c958bad (patch) | |
| tree | 78965e05c224a82db4968a35a4626f53973b683c /ext/ftp/tests/ftp_nb_fget_basic1.phpt | |
| parent | 6daa04a4f606f8121d9f1ea6cd90c1c8a684500e (diff) | |
| download | php-git-ecbe4af0de94c629fa5ba8ab169654e00c958bad.tar.gz | |
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.
Diffstat (limited to 'ext/ftp/tests/ftp_nb_fget_basic1.phpt')
| -rw-r--r-- | ext/ftp/tests/ftp_nb_fget_basic1.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/ftp/tests/ftp_nb_fget_basic1.phpt b/ext/ftp/tests/ftp_nb_fget_basic1.phpt index cac4eec56b..5e6389ff13 100644 --- a/ext/ftp/tests/ftp_nb_fget_basic1.phpt +++ b/ext/ftp/tests/ftp_nb_fget_basic1.phpt @@ -16,7 +16,7 @@ ftp_login($ftp, 'user', 'pass'); if (!$ftp) die("Couldn't connect to the server"); ftp_set_option($ftp, FTP_AUTOSEEK, false); -$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt"; +$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic1.txt"; $handle = fopen($local_file, 'w'); var_dump(ftp_nb_fget($ftp, $handle, 'fget.txt', FTP_ASCII, FTP_AUTORESUME)); @@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file)); ?> --CLEAN-- <?php -@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt"); +@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic1.txt"); ?> --EXPECT-- int(2) |