Skip to content

Commit a6e2455

Browse files
TysonAndreTysonAndre
committed
Don't run sapi/fpm tests in parallel with other fpm tests
See discussion on php#7561 fpm tests have been spuriously failing in CI, with 2 parallel workers on 2 CPUs. `make test TESTS='sapi/fpm/tests -j8'` fails locally for me without this change They're trying to listen on IPv4 on 127.0.0.1 on the same port as other tests (e.g. helper getPort()=9008 on 64-bit architecture (PHP_INT_SIZE=8)). So tests will fail if 1. php-fpm is still running from another test in parallel. 2. a request is sent to a server for a different test.
1 parent ee3caef commit a6e2455

File tree

64 files changed

+128
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+128
-0
lines changed

‎sapi/fpm/tests/bug68381-log-level-warning.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug68381 - Log messages with warning level only
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/bug68391-conf-include-order.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug68391 - Configuration inclusion in alphabetical order
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/bug68420-ipv4-all-addresses.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug68420 - IPv4 all addresses
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/bug68421-ipv6-access-log.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug68421 - IPv6 all addresses and access_log
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/bug68423-multi-pool-all-pms.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug68423 - Multiple pools with different PMs (dynamic + ondemand + static)
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/bug68428-ipv6-allowed-clients.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug68428 - IPv6 allowed client only
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/bug68442-signal-reload.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug68442 - Signal reload
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/bug68458-pm-no-start-server.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug68458 - Missing pm.start_servers should emit notice instead of warning
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/bug69625-no-script-filename.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug69625 - 404 should be returned on missing SCRIPT_FILENAME
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/bug72573-http-proxy.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug72573 - HTTP_PROXY - CVE-2016-5385
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/bug73342-nonblocking-stdio.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug73342 - Non-blocking stdin
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/bug74083-concurrent-reload.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Concurrent reload signals should not kill PHP-FPM master process. (Bug: #74083)
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/bug75212-php-value-in-user-ini.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug75212 - php_value acts like php_admin_value
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/bug76601-reload-child-signals.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug76601 children should not ignore signals during concurrent reloads
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/bug77934-reload-process-control.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug77934 - php-fpm kill -USR2 not working
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/bug78323.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Bug #78323 Test exit code for invalid parameters
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/bug78599-path-info-underflow.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug78599 - env_path_info underflow - CVE-2019-11043
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/bug80024-socket-reduced-inherit.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug80024 - Duplication of info about inherited socket after pool removing
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/bug80849-fpm.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Bug #80849 (HTTP Status header truncation)
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/fastcgi_finish_request_basic.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Function fastcgi_finish_request basic test
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/fpm_get_status_basic.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Function fpm_get_status basic test
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/getallheaders.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Function getallheaders basic test
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bm-in-shutdown-fn.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Log message in shutdown function
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bm-limit-1024-msg-80.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered message output log with limit 1024 and msg 80
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bm-limit-2048-msg-4000.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered message output log with limit 2048 and msg 4000
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwd-limit-1050-msg-2048.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output decorated log with limit 1050 with 2048 msg
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwd-limit-1050-msg-2900.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output decorated log with limit 1050 with 2900 msg
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwd-limit-64-too-low-error.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output decorated log with limit 64 fails because it is too low
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwd-limit-8000-msg-4096.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output decorated log with limit 8000 with 4096 msg
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwd-msg-with-nl.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output decorated log with msg containing new lines
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output decorated log with multiple continuous messages (stdout/stderr mixed)
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--XFAIL--

‎sapi/fpm/tests/log-bwd-multiple-msgs.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output decorated log with multiple continuous messages
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwp-limit-1024-msg-120.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output plain log with limit 1024 and msg 120
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwp-limit-1500-msg-3300.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output plain log with limit 1500 and msg 3300
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwp-msg-flush-split-fallback.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output plain log with msg with flush split in buffer
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwp-msg-flush-split-real.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Buffered worker output plain log with msg with flush split in buffer
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-bwp-realloc-buffer.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: bug81513 - Buffered worker output plain log stream reallocation
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-dwd-limit-1050-msg-2048.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Direct worker output decorated log with limit 1050 with 2048 msg
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-dwd-limit-1050-msg-2900.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Direct worker output decorated log with limit 1050 with 2900 msg
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-dwd-limit-8000-msg-4096.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Direct worker output decorated log with limit 8000 with 4096 msg
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/log-dwp-limit-1000-msg-2000.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Direct worker output plain log with limit 1000 and msg 2000
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/main-global-prefix.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Main invocation with prefix
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/main-version.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: version string
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/php-admin-doc-root.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: php_admin_value doc_root usage
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php include "skipif.inc"; ?>
57
--FILE--

‎sapi/fpm/tests/pm-max-spawn-rate-config.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: set pm.max_spawn_rate
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/pm-max-spawn-rate-run.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: set pm.max_spawn_rate
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/pool-apparmor-basic.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: AppArmor basic test
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/pool-prefix.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Pool prefix
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/proc-idle-timeout.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Process manager config pm.process_idle_timeout
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

‎sapi/fpm/tests/proc-no-start-server.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
FPM: Process manager config option pm.start_servers missing
3+
--CONFLICTS--
4+
fpm
35
--SKIPIF--
46
<?php
57
include "skipif.inc";

0 commit comments

Comments
 (0)