clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* PHP-5.6:
  simplify fpm tests
This commit is contained in:
Remi Collet 2014-11-18 13:12:19 +01:00
commit 43a02fc31d
10 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sapi/fpm/tests/002.phpt
View File

@ -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

9
sapi/fpm/tests/003.phpt
View File

@ -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

9
sapi/fpm/tests/004.phpt
View File

@ -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--

3
sapi/fpm/tests/005.phpt
View File

@ -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";

3
sapi/fpm/tests/006.phpt
View File

@ -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";

3
sapi/fpm/tests/007.phpt
View File

@ -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";

3
sapi/fpm/tests/008.phpt
View File

@ -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";

3
sapi/fpm/tests/009.phpt
View File

@ -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";

3
sapi/fpm/tests/010.phpt
View File

@ -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');

3
sapi/fpm/tests/011.phpt
View File

@ -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";