com php-src: simplify fpm tests: sapi/fpm/tests/002.phpt sapi/fpm/tests/003.phpt sapi/fpm/tests/004.phpt sapi/fpm/tests/005.phpt
sapi/fpm/tests/006.phpt sapi/fpm/tests/007.phpt sapi/fpm/tests/008.phpt sapi/fpm/tests/009.phpt sapi/fpm/tests/010.phpt sapi/fpm/tests/011.phpt

From: Date: Tue, 18 Nov 2014 12:11:53 +0000
Subject: com php-src: simplify fpm tests: sapi/fpm/tests/002.phpt sapi/fpm/tests/003.phpt sapi/fpm/tests/004.phpt sapi/fpm/tests/005.phpt
sapi/fpm/tests/006.phpt sapi/fpm/tests/007.phpt sapi/fpm/tests/008.phpt sapi/fpm/tests/009.phpt sapi/fpm/tests/010.phpt sapi/fpm/tests/011.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83130@lists.php.net to get a copy of this message
Commit: ec26d7a80f1d486d79d6319f891bd474bad3710d Author: Remi Collet <remi@php.net> Tue, 18 Nov 2014 13:11:53 +0100 Parents: 51394dff3f8d55fd40823e1841a97e631f4dfec5 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ec26d7a80f1d486d79d6319f891bd474bad3710d Log: simplify fpm tests Changed paths: M sapi/fpm/tests/002.phpt M sapi/fpm/tests/003.phpt M sapi/fpm/tests/004.phpt M sapi/fpm/tests/005.phpt M sapi/fpm/tests/006.phpt M sapi/fpm/tests/007.phpt M sapi/fpm/tests/008.phpt M sapi/fpm/tests/009.phpt M sapi/fpm/tests/010.phpt M sapi/fpm/tests/011.phpt Diff: diff --git a/sapi/fpm/tests/002.phpt b/sapi/fpm/tests/002.phpt index ce87866..89e4318 100644 --- a/sapi/fpm/tests/002..phpt +++ b/sapi/fpm/tests/002.phpt @@ -24,8 +24,7 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { - var_dump(fgets($tail)); - var_dump(fgets($tail)); + fpm_display_log($tail, 2); $i = 0; while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) { usleep(10000); @@ -42,10 +41,8 @@ if (is_resource($fpm)) { ?> --EXPECTF-- -string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d -" -string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections -" +[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d +[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections Done --CLEAN-- <?php diff --git a/sapi/fpm/tests/003.phpt b/sapi/fpm/tests/003.phpt index 0ce1bd2..f928626 100644 --- a/sapi/fpm/tests/003.phpt +++ b/sapi/fpm/tests/003.phpt @@ -24,8 +24,7 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { - var_dump(fgets($tail)); - var_dump(fgets($tail)); + fpm_display_log($tail, 2); $i = 0; while (($i++ < 30) && !($fp = fsockopen('[::1]', $port))) { usleep(10000); @@ -42,10 +41,8 @@ if (is_resource($fpm)) { ?> --EXPECTF-- -string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d -" -string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections -" +[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d +[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections Done --CLEAN-- <?php diff --git a/sapi/fpm/tests/004.phpt b/sapi/fpm/tests/004.phpt index 0d39b13..2a4d666 100644 --- a/sapi/fpm/tests/004..phpt +++ b/sapi/fpm/tests/004.phpt @@ -24,8 +24,7 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { - var_dump(fgets($tail)); - var_dump(fgets($tail)); + fpm_display_log($tail, 2); $i = 0; while (($i++ < 30) && !($fp = @fsockopen('127.0.0.1', $port))) { usleep(10000); @@ -49,10 +48,8 @@ if (is_resource($fpm)) { ?> --EXPECTF-- -string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d -" -string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections -" +[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d +[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections Done IPv4 Done IPv6 --CLEAN-- diff --git a/sapi/fpm/tests/005.phpt b/sapi/fpm/tests/005.phpt index 992b01f..c565c2a 100644 --- a/sapi/fpm/tests/005.phpt +++ b/sapi/fpm/tests/005.phpt @@ -25,8 +25,7 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { - echo fgets($tail); - echo fgets($tail); + fpm_display_log($tail, 2); try { run_request('127.0.0.1', $port); echo "IPv4 ok\n"; diff --git a/sapi/fpm/tests/006.phpt b/sapi/fpm/tests/006.phpt index d8b47ee..a12ca25 100644 --- a/sapi/fpm/tests/006.phpt +++ b/sapi/fpm/tests/006.phpt @@ -25,8 +25,7 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { - echo fgets($tail); - echo fgets($tail); + fpm_display_log($tail, 2); try { run_request('127.0.0.1', $port); echo "IPv4 ok\n"; diff --git a/sapi/fpm/tests/007.phpt b/sapi/fpm/tests/007.phpt index 1889381..0d81790 100644 --- a/sapi/fpm/tests/007.phpt +++ b/sapi/fpm/tests/007.phpt @@ -28,8 +28,7 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { - echo fgets($tail); - echo fgets($tail); + fpm_display_log($tail, 2); try { var_dump(strpos(run_request('127.0..0.1', $port), 'pong')); echo "IPv4 ok\n"; diff --git a/sapi/fpm/tests/008.phpt b/sapi/fpm/tests/008.phpt index aaa7730..60f1ea6 100644 --- a/sapi/fpm/tests/008.phpt +++ b/sapi/fpm/tests/008.phpt @@ -41,8 +41,7 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { - echo fgets($tail); - echo fgets($tail); + fpm_display_log($tail, 2); try { var_dump(strpos(run_request('127.0.0..1', $port1), 'pong-dynamic')); echo "Dynamic ok\n"; diff --git a/sapi/fpm/tests/009.phpt b/sapi/fpm/tests/009.phpt index 836fb19..34cdffc 100644 --- a/sapi/fpm/tests/009.phpt +++ b/sapi/fpm/tests/009.phpt @@ -26,8 +26,7 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { - echo fgets($tail); - echo fgets($tail); + fpm_display_log($tail, 2); try { var_dump(strpos(run_request('unix://'.$socket, -1), 'pong')); echo "UDS ok\n"; diff --git a/sapi/fpm/tests/010.phpt b/sapi/fpm/tests/010.phpt index dc8d5bb..37c778d 100644 --- a/sapi/fpm/tests/010.phpt +++ b/sapi/fpm/tests/010.phpt @@ -25,8 +25,7 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { - echo fgets($tail); - echo fgets($tail); + fpm_display_log($tail, 2); try { echo run_request('127.0.0.1', $port, '/status'); diff --git a/sapi/fpm/tests/011.phpt b/sapi/fpm/tests/011.phpt index ddcf67f..0b849f8 100644 --- a/sapi/fpm/tests/011.phpt +++ b/sapi/fpm/tests/011.phpt @@ -26,8 +26,7 @@ EOT; $fpm = run_fpm($cfg, $tail); if (is_resource($fpm)) { - echo fgets($tail); - echo fgets($tail); + fpm_display_log($tail, 2); try { var_dump(strpos(run_request('127.0.0.1', $port), 'pong')); echo "IPv4 ok\n";

« previous php.cvs (#83130) next »