simplify fpm tests

diff --git a/sapi/fpm/tests/002.phpt b/sapi/fpm/tests/002.phpt
index ce878661eaf54e8ee66f2fd9fd5d08a2a7d2933a..89e431849ab3b36e56bf528ec680297fa9aebead 100644 (file)
--- 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 0ce1bd2828ad4560d07c41075fdef644190b623d..f928626eccfa5e178f3a4023d7961e1c91a6c4e0 100644 (file)
--- 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 0d39b1399b361750508f676bf2677bd91d026be5..2a4d666c64fb18c5cc34c0d342e216bb30224177 100644 (file)
--- 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 992b01f08e8b4b33da34e77d9453e04f0ab0b630..c565c2a9ebd7a22609f592180d26f17f328e3460 100644 (file)
--- 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 d8b47ee5338a958352c3541a9ada15435fd5b356..a12ca253d210351ec20517e14dd287464ff0b2a0 100644 (file)
--- 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 18893819e21469f58310fed5f26d7871bd19643f..0d817907cf06aef9b7d650a9c6ab0c0ef23e0d98 100644 (file)
--- 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 aaa773093cb8a4097a7e89f9329dd162e19d10ad..60f1ea6ebda5bf3c64250a8198d9fa998a0afa0c 100644 (file)
--- 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 836fb1932366c0d7769912ce10eb01619dbc408d..34cdffcf833a973cc0c8acf205aace8ae6623f4b 100644 (file)
--- 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 dc8d5bb949f0f5238e664d546e240aa0343dd50b..37c778db5be2eebd5a8ba3fa8608134473a2e147 100644 (file)
--- 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 ddcf67f6d3aa76affdb59910a716bbfda1982d24..0b849f873ba0de0a56976c63572f2592f86427e9 100644 (file)
--- 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";