Skip to content

Don't run sapi/fpm tests in parallel with other fpm tests #7696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Don't run sapi/fpm tests in parallel with other fpm tests #7696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug68381-log-level-warning.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug68381 - Log messages with warning level only
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug68391-conf-include-order.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug68391 - Configuration inclusion in alphabetical order
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug68420-ipv4-all-addresses.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug68420 - IPv4 all addresses
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug68421-ipv6-access-log.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug68421 - IPv6 all addresses and access_log
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug68423-multi-pool-all-pms.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug68423 - Multiple pools with different PMs (dynamic + ondemand + static)
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug68428 - IPv6 allowed client only
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug68442-signal-reload.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug68442 - Signal reload
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug68458-pm-no-start-server.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug68458 - Missing pm.start_servers should emit notice instead of warning
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug69625-no-script-filename.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug69625 - 404 should be returned on missing SCRIPT_FILENAME
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug72573-http-proxy.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug72573 - HTTP_PROXY - CVE-2016-5385
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug73342-nonblocking-stdio.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug73342 - Non-blocking stdin
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug74083-concurrent-reload.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
Concurrent reload signals should not kill PHP-FPM master process. (Bug: #74083)
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug75212-php-value-in-user-ini.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug75212 - php_value acts like php_admin_value
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug76601-reload-child-signals.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug76601 children should not ignore signals during concurrent reloads
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug77934-reload-process-control.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug77934 - php-fpm kill -USR2 not working
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug78323.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Bug #78323 Test exit code for invalid parameters
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug78599-path-info-underflow.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug78599 - env_path_info underflow - CVE-2019-11043
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug80024 - Duplication of info about inherited socket after pool removing
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/bug80849-fpm.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
Bug #80849 (HTTP Status header truncation)
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/fastcgi_finish_request_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Function fastcgi_finish_request basic test
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/fpm_get_status_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Function fpm_get_status basic test
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/getallheaders.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Function getallheaders basic test
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bm-in-shutdown-fn.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Log message in shutdown function
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered message output log with limit 1024 and msg 80
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered message output log with limit 2048 and msg 4000
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output decorated log with limit 1050 with 2048 msg
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output decorated log with limit 1050 with 2900 msg
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output decorated log with limit 64 fails because it is too low
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output decorated log with limit 8000 with 4096 msg
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwd-msg-with-nl.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output decorated log with msg containing new lines
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output decorated log with multiple continuous messages (stdout/stderr mixed)
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--XFAIL--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwd-multiple-msgs.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output decorated log with multiple continuous messages
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output plain log with limit 1024 and msg 120
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output plain log with limit 1500 and msg 3300
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output plain log with msg with flush split in buffer
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Buffered worker output plain log with msg with flush split in buffer
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-bwp-realloc-buffer.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: bug81513 - Buffered worker output plain log stream reallocation
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Direct worker output decorated log with limit 1050 with 2048 msg
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Direct worker output decorated log with limit 1050 with 2900 msg
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Direct worker output decorated log with limit 8000 with 4096 msg
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Direct worker output plain log with limit 1000 and msg 2000
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/main-global-prefix.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Main invocation with prefix
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/main-version.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: version string
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/php-admin-doc-root.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: php_admin_value doc_root usage
--CONFLICTS--
fpm
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/pm-max-spawn-rate-config.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: set pm.max_spawn_rate
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/pm-max-spawn-rate-run.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: set pm.max_spawn_rate
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/pool-apparmor-basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: AppArmor basic test
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/pool-prefix.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Pool prefix
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/proc-idle-timeout.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Process manager config pm.process_idle_timeout
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
2 changes: 2 additions & 0 deletions sapi/fpm/tests/proc-no-start-server.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
--TEST--
FPM: Process manager config option pm.start_servers missing
--CONFLICTS--
fpm
--SKIPIF--
<?php
include "skipif.inc";
Expand Down
Loading