archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Increase wait time for tests involving sockets to improve Travis relability

Browse source 
1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers
This commit is contained in:
Mitch Hagstrand 2017-01-12 22:09:46 -08:00 • committed by Joe Watkins
parent 04379bcb1d
commit fd92b91188
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
10 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/curl/tests/bug64267.phpt
View file

@ -17,8 +17,8 @@ var_dump(curl_setopt_array($c, [
CURLOPT_UPLOAD => true,
CURLOPT_INFILE => $f,
CURLOPT_INFILESIZE => filesize(__FILE__),
CURLOPT_CONNECTTIMEOUT => 1,
CURLOPT_TIMEOUT => 1,
CURLOPT_CONNECTTIMEOUT => 3,
CURLOPT_TIMEOUT => 3,
]));
fclose($f);
var_dump(curl_setopt_array($c, [

12
ext/curl/tests/server.inc
View file

@ -33,9 +33,9 @@ function curl_cli_server_start() {
// note: even when server prints 'Listening on localhost:8964...Press Ctrl-C to quit.'
// it might not be listening yet...need to wait until fsockopen() call returns
$error = "Unable to connect to servers\n";
$error = "Unable to connect to server\n";
for ($i=0; $i < 60; $i++) {
usleep(25000); // 25ms per try
usleep(50000); // 50ms per try
$status = proc_get_status($handle);
$fp = @fsockopen(PHP_CURL_SERVER_HOSTNAME, PHP_CURL_SERVER_PORT);
// Failure, the server is no longer running
@ -63,6 +63,14 @@ function curl_cli_server_start() {
register_shutdown_function(
function($handle) use($router) {
proc_terminate($handle);
/* Wait for server to shutdown */
for ($i = 0; $i < 60; $i++) {
$status = proc_get_status($handle);
if (!($status && $status['running'])) {
break;
}
usleep(50000);
}
},
$handle
);

12
ext/opcache/tests/php_cli_server.inc
View file

@ -23,9 +23,9 @@ function php_cli_server_start($ini = "") {
// note: even when server prints 'Listening on localhost:8964...Press Ctrl-C to quit.'
// it might not be listening yet...need to wait until fsockopen() call returns
$error = "Unable to connect to servers\n";
$error = "Unable to connect to server\n";
for ($i=0; $i < 60; $i++) {
usleep(25000); // 25ms per try
usleep(50000); // 50ms per try
$status = proc_get_status($handle);
$fp = @fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT);
// Failure, the server is no longer running
@ -53,6 +53,14 @@ function php_cli_server_start($ini = "") {
register_shutdown_function(
function($handle) {
proc_terminate($handle);
/* Wait for server to shutdown */
for ($i = 0; $i < 60; $i++) {
$status = proc_get_status($handle);
if (!($status && $status['running'])) {
break;
}
usleep(50000);
}
},
$handle
);

6
sapi/cli/tests/php_cli_server.inc
View file

@ -36,9 +36,9 @@ function php_cli_server_start($code = 'echo "Hello world";', $router = 'index.ph
// note: even when server prints 'Listening on localhost:8964...Press Ctrl-C to quit.'
// it might not be listening yet...need to wait until fsockopen() call returns
$error = "Unable to connect to servers\n";
$error = "Unable to connect to server\n";
for ($i=0; $i < 60; $i++) {
usleep(25000); // 25ms per try
usleep(50000); // 50ms per try
$status = proc_get_status($handle);
$fp = @fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT);
// Failure, the server is no longer running
@ -85,7 +85,7 @@ function php_cli_server_stop($handle) {
$success = TRUE;
break;
}
usleep(25000);
usleep(50000);
}
}
return $success;

2
sapi/fpm/tests/002.phpt
View file

@ -27,7 +27,7 @@ if (is_resource($fpm)) {
fpm_display_log($tail, 2);
$i = 0;
while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) {
usleep(25000);
usleep(50000);
}
if ($fp) {
echo "Done\n";

2
sapi/fpm/tests/003.phpt
View file

@ -30,7 +30,7 @@ if (is_resource($fpm)) {
fpm_display_log($tail, 2);
$i = 0;
while (($i++ < 60) && !($fp = fsockopen('[::1]', $port))) {
usleep(25000);
usleep(50000);
}
if ($fp) {
echo "Done\n";

4
sapi/fpm/tests/004.phpt
View file

@ -30,14 +30,14 @@ if (is_resource($fpm)) {
fpm_display_log($tail, 2);
$i = 0;
while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) {
usleep(25000);
usleep(50000);
}
if ($fp) {
echo "Done IPv4\n";
fclose($fp);
}
while (($i++ < 60) && !($fp = @fsockopen('[::1]', $port))) {
usleep(25000);
usleep(50000);
}
if ($fp) {
echo "Done IPv6\n";

2
sapi/fpm/tests/013.phpt
View file

@ -28,7 +28,7 @@ $fpm = run_fpm($cfg, $tail);
if (is_resource($fpm)) {
$i = 0;
while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) {
usleep(25000);
usleep(50000);
}
if ($fp) {
echo "Started\n";

2
sapi/fpm/tests/014.phpt
View file

@ -28,7 +28,7 @@ $fpm = run_fpm($cfg, $tail);
if (is_resource($fpm)) {
$i = 0;
while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port))) {
usleep(25000);
usleep(50000);
}
if ($fp) {
echo "Started\n";

2
sapi/fpm/tests/015.phpt
View file

@ -43,7 +43,7 @@ $fpm = run_fpm($cfg, $tail);
if (is_resource($fpm)) {
$i = 0;
while (($i++ < 60) && !($fp = @fsockopen('127.0.0.1', $port1))) {
usleep(25000);
usleep(50000);
}
if ($fp) {
echo "Started\n";