From 4361fffaeaddd8da6ea00a3b2eafef247c7edf99 Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Sun, 28 Mar 2021 21:06:45 +0100
Subject: Add extra run test for pm.max_spawn_rate

---
 sapi/fpm/tests/pm-max-spawn-rate-config.phpt | 39 ++++++++++++++++++++++++
 sapi/fpm/tests/pm-max-spawn-rate-run.phpt    | 44 ++++++++++++++++++++++++++++
 sapi/fpm/tests/set-pm-max-spawn-rate.phpt    | 39 ------------------------
 3 files changed, 83 insertions(+), 39 deletions(-)
 create mode 100644 sapi/fpm/tests/pm-max-spawn-rate-config.phpt
 create mode 100644 sapi/fpm/tests/pm-max-spawn-rate-run.phpt
 delete mode 100644 sapi/fpm/tests/set-pm-max-spawn-rate.phpt

diff --git a/sapi/fpm/tests/pm-max-spawn-rate-config.phpt b/sapi/fpm/tests/pm-max-spawn-rate-config.phpt
new file mode 100644
index 0000000000..8b5f6b4eb6
--- /dev/null
+++ b/sapi/fpm/tests/pm-max-spawn-rate-config.phpt
@@ -0,0 +1,39 @@
+--TEST--
+FPM: set pm.max_spawn_rate
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+[global]
+error_log = {{FILE:LOG}}
+log_level = notice
+[unconfined]
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+pm.max_spawn_rate = 64
+EOT;
+
+$tester = new FPM\Tester($cfg);
+$tester->start(['-t', '-t']);
+$tester->expectLogConfigOptions(['pm.max_spawn_rate' => 64]);
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>
diff --git a/sapi/fpm/tests/pm-max-spawn-rate-run.phpt b/sapi/fpm/tests/pm-max-spawn-rate-run.phpt
new file mode 100644
index 0000000000..ca128b4675
--- /dev/null
+++ b/sapi/fpm/tests/pm-max-spawn-rate-run.phpt
@@ -0,0 +1,44 @@
+--TEST--
+FPM: set pm.max_spawn_rate
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+[global]
+error_log = {{FILE:LOG}}
+log_level = notice
+[unconfined]
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+pm.max_spawn_rate = 64
+ping.path = /ping
+ping.response = pong
+EOT;
+
+$tester = new FPM\Tester($cfg);
+$tester->start();
+$tester->expectLogStartNotices();
+$tester->ping();
+$tester->terminate();
+$tester->expectLogTerminatingNotices();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>
diff --git a/sapi/fpm/tests/set-pm-max-spawn-rate.phpt b/sapi/fpm/tests/set-pm-max-spawn-rate.phpt
deleted file mode 100644
index 8b5f6b4eb6..0000000000
--- a/sapi/fpm/tests/set-pm-max-spawn-rate.phpt
+++ /dev/null
@@ -1,39 +0,0 @@
---TEST--
-FPM: set pm.max_spawn_rate
---SKIPIF--
-<?php
-include "skipif.inc";
-?>
---FILE--
-<?php
-
-require_once "tester.inc";
-
-$cfg = <<<EOT
-[global]
-error_log = {{FILE:LOG}}
-log_level = notice
-[unconfined]
-listen = {{ADDR}}
-pm = dynamic
-pm.max_children = 5
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-pm.max_spawn_rate = 64
-EOT;
-
-$tester = new FPM\Tester($cfg);
-$tester->start(['-t', '-t']);
-$tester->expectLogConfigOptions(['pm.max_spawn_rate' => 64]);
-$tester->close();
-
-?>
-Done
---EXPECT--
-Done
---CLEAN--
-<?php
-require_once "tester.inc";
-FPM\Tester::clean();
-?>
-- 
cgit v1.2.1