Skip to content

Commit c4cad2e

Browse files
markuslfmarkuslf
committed
test(apache-httpd-status): extend fixture coverage to Debian and Fedora 43
Add fresh captures for every current Debian release plus Fedora 43 to round out the existing RHEL 7..10 and Fedora 34 set. Each new scenario ships the Stage 1 (ExtendedStatus Off) and Stage 3 (ExtendedStatus On, three-call progression) sequences. debian10 apache 2.4.59 (archive.debian.org) debian11 apache 2.4.66 debian12 apache 2.4.66 debian13 apache 2.4.66 fedora43 apache 2.4.66 The fedora43 / debian13 captures pin the parser against the newest httpd release (2.4.66) so any future format drift shows up.
1 parent f6865b1 commit c4cad2e

21 files changed

+812
-0
lines changed

‎check-plugins/apache-httpd-status/unit-test/run‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,126 @@ SCENARIOS = [
180180
},
181181
],
182182
},
183+
{
184+
'id': 'debian10-httpd-2.4.59-event-ext-off',
185+
'steps': [
186+
{
187+
'test': 'stdout/debian10-httpd-2.4.59-event-ext-off,,0',
188+
'assert-retc': STATE_OK,
189+
'assert-regex': STAGE1_REGEX,
190+
},
191+
],
192+
},
193+
{
194+
'id': 'debian10-httpd-2.4.59-event-ext-on',
195+
'steps': [
196+
{
197+
'test': 'stdout/debian10-httpd-2.4.59-event-ext-on-1,,0',
198+
'assert-retc': STATE_OK,
199+
'assert-in': ['Waiting for more data (1).'],
200+
},
201+
{
202+
'test': 'stdout/debian10-httpd-2.4.59-event-ext-on-2,,0',
203+
'assert-retc': STATE_OK,
204+
'assert-in': ['Waiting for more data (3).'],
205+
},
206+
{
207+
'test': 'stdout/debian10-httpd-2.4.59-event-ext-on-3,,0',
208+
'assert-retc': STATE_OK,
209+
'assert-regex': STAGE3_REGEX,
210+
},
211+
],
212+
},
213+
{
214+
'id': 'debian11-httpd-2.4.66-event-ext-off',
215+
'steps': [
216+
{
217+
'test': 'stdout/debian11-httpd-2.4.66-event-ext-off,,0',
218+
'assert-retc': STATE_OK,
219+
'assert-regex': STAGE1_REGEX,
220+
},
221+
],
222+
},
223+
{
224+
'id': 'debian11-httpd-2.4.66-event-ext-on',
225+
'steps': [
226+
{
227+
'test': 'stdout/debian11-httpd-2.4.66-event-ext-on-1,,0',
228+
'assert-retc': STATE_OK,
229+
'assert-in': ['Waiting for more data (1).'],
230+
},
231+
{
232+
'test': 'stdout/debian11-httpd-2.4.66-event-ext-on-2,,0',
233+
'assert-retc': STATE_OK,
234+
'assert-in': ['Waiting for more data (3).'],
235+
},
236+
{
237+
'test': 'stdout/debian11-httpd-2.4.66-event-ext-on-3,,0',
238+
'assert-retc': STATE_OK,
239+
'assert-regex': STAGE3_REGEX,
240+
},
241+
],
242+
},
243+
{
244+
'id': 'debian12-httpd-2.4.66-event-ext-off',
245+
'steps': [
246+
{
247+
'test': 'stdout/debian12-httpd-2.4.66-event-ext-off,,0',
248+
'assert-retc': STATE_OK,
249+
'assert-regex': STAGE1_REGEX,
250+
},
251+
],
252+
},
253+
{
254+
'id': 'debian12-httpd-2.4.66-event-ext-on',
255+
'steps': [
256+
{
257+
'test': 'stdout/debian12-httpd-2.4.66-event-ext-on-1,,0',
258+
'assert-retc': STATE_OK,
259+
'assert-in': ['Waiting for more data (1).'],
260+
},
261+
{
262+
'test': 'stdout/debian12-httpd-2.4.66-event-ext-on-2,,0',
263+
'assert-retc': STATE_OK,
264+
'assert-in': ['Waiting for more data (3).'],
265+
},
266+
{
267+
'test': 'stdout/debian12-httpd-2.4.66-event-ext-on-3,,0',
268+
'assert-retc': STATE_OK,
269+
'assert-regex': STAGE3_REGEX,
270+
},
271+
],
272+
},
273+
{
274+
'id': 'debian13-httpd-2.4.66-event-ext-off',
275+
'steps': [
276+
{
277+
'test': 'stdout/debian13-httpd-2.4.66-event-ext-off,,0',
278+
'assert-retc': STATE_OK,
279+
'assert-regex': STAGE1_REGEX,
280+
},
281+
],
282+
},
283+
{
284+
'id': 'debian13-httpd-2.4.66-event-ext-on',
285+
'steps': [
286+
{
287+
'test': 'stdout/debian13-httpd-2.4.66-event-ext-on-1,,0',
288+
'assert-retc': STATE_OK,
289+
'assert-in': ['Waiting for more data (1).'],
290+
},
291+
{
292+
'test': 'stdout/debian13-httpd-2.4.66-event-ext-on-2,,0',
293+
'assert-retc': STATE_OK,
294+
'assert-in': ['Waiting for more data (3).'],
295+
},
296+
{
297+
'test': 'stdout/debian13-httpd-2.4.66-event-ext-on-3,,0',
298+
'assert-retc': STATE_OK,
299+
'assert-regex': STAGE3_REGEX,
300+
},
301+
],
302+
},
183303
{
184304
'id': 'fedora34-httpd-2.4.48-event-ext-off',
185305
'steps': [
@@ -190,6 +310,36 @@ SCENARIOS = [
190310
},
191311
],
192312
},
313+
{
314+
'id': 'fedora43-httpd-2.4.66-event-ext-off',
315+
'steps': [
316+
{
317+
'test': 'stdout/fedora43-httpd-2.4.66-event-ext-off,,0',
318+
'assert-retc': STATE_OK,
319+
'assert-regex': STAGE1_REGEX,
320+
},
321+
],
322+
},
323+
{
324+
'id': 'fedora43-httpd-2.4.66-event-ext-on',
325+
'steps': [
326+
{
327+
'test': 'stdout/fedora43-httpd-2.4.66-event-ext-on-1,,0',
328+
'assert-retc': STATE_OK,
329+
'assert-in': ['Waiting for more data (1).'],
330+
},
331+
{
332+
'test': 'stdout/fedora43-httpd-2.4.66-event-ext-on-2,,0',
333+
'assert-retc': STATE_OK,
334+
'assert-in': ['Waiting for more data (3).'],
335+
},
336+
{
337+
'test': 'stdout/fedora43-httpd-2.4.66-event-ext-on-3,,0',
338+
'assert-retc': STATE_OK,
339+
'assert-regex': STAGE3_REGEX,
340+
},
341+
],
342+
},
193343
{
194344
# Fixture captured on a real host under load; the third call
195345
# reports 325/400 busy workers which crosses the default 80%

‎check-plugins/apache-httpd-status/unit-test/stdout/debian10-httpd-2.4.59-event-ext-off‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
localhost
2+
ServerVersion: Apache/2.4.59 (Debian)
3+
ServerMPM: event
4+
Server Built: 2024-05-24T22:36:21
5+
CurrentTime: Monday, 13-Apr-2026 08:55:38 UTC
6+
RestartTime: Monday, 13-Apr-2026 08:55:35 UTC
7+
ParentServerConfigGeneration: 1
8+
ParentServerMPMGeneration: 0
9+
ServerUptimeSeconds: 2
10+
ServerUptime: 2 seconds
11+
Load1: 2.48
12+
Load5: 1.81
13+
Load15: 1.44
14+
BusyWorkers: 1
15+
GracefulWorkers: 0
16+
IdleWorkers: 49
17+
Processes: 2
18+
Stopping: 0
19+
ConnsTotal: 0
20+
ConnsAsyncWriting: 0
21+
ConnsAsyncKeepAlive: 0
22+
ConnsAsyncClosing: 0
23+
Scoreboard: ________________________________W_________________....................................................................................................

‎check-plugins/apache-httpd-status/unit-test/stdout/debian10-httpd-2.4.59-event-ext-on-1‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
localhost
2+
ServerVersion: Apache/2.4.59 (Debian)
3+
ServerMPM: event
4+
Server Built: 2024-05-24T22:36:21
5+
CurrentTime: Monday, 13-Apr-2026 08:54:58 UTC
6+
RestartTime: Monday, 13-Apr-2026 08:54:55 UTC
7+
ParentServerConfigGeneration: 1
8+
ParentServerMPMGeneration: 0
9+
ServerUptimeSeconds: 2
10+
ServerUptime: 2 seconds
11+
Load1: 1.87
12+
Load5: 1.66
13+
Load15: 1.38
14+
Total Accesses: 25
15+
Total kBytes: 7
16+
Total Duration: 3
17+
CPUUser: 0
18+
CPUSystem: 0
19+
CPUChildrenUser: 0
20+
CPUChildrenSystem: 0
21+
Uptime: 2
22+
ReqPerSec: 12.5
23+
BytesPerSec: 3584
24+
BytesPerReq: 286.72
25+
DurationPerReq: .12
26+
BusyWorkers: 1
27+
GracefulWorkers: 0
28+
IdleWorkers: 49
29+
Processes: 2
30+
Stopping: 0
31+
ConnsTotal: 0
32+
ConnsAsyncWriting: 0
33+
ConnsAsyncKeepAlive: 0
34+
ConnsAsyncClosing: 0
35+
Scoreboard: __________________________________________W_______....................................................................................................

‎check-plugins/apache-httpd-status/unit-test/stdout/debian10-httpd-2.4.59-event-ext-on-2‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
localhost
2+
ServerVersion: Apache/2.4.59 (Debian)
3+
ServerMPM: event
4+
Server Built: 2024-05-24T22:36:21
5+
CurrentTime: Monday, 13-Apr-2026 08:55:01 UTC
6+
RestartTime: Monday, 13-Apr-2026 08:54:55 UTC
7+
ParentServerConfigGeneration: 1
8+
ParentServerMPMGeneration: 0
9+
ServerUptimeSeconds: 5
10+
ServerUptime: 5 seconds
11+
Load1: 1.87
12+
Load5: 1.66
13+
Load15: 1.38
14+
Total Accesses: 51
15+
Total kBytes: 15
16+
Total Duration: 7
17+
CPUUser: 0
18+
CPUSystem: 0
19+
CPUChildrenUser: 0
20+
CPUChildrenSystem: 0
21+
Uptime: 5
22+
ReqPerSec: 10.2
23+
BytesPerSec: 3072
24+
BytesPerReq: 301.176
25+
DurationPerReq: .137255
26+
BusyWorkers: 1
27+
GracefulWorkers: 0
28+
IdleWorkers: 49
29+
Processes: 2
30+
Stopping: 0
31+
ConnsTotal: 0
32+
ConnsAsyncWriting: 0
33+
ConnsAsyncKeepAlive: 0
34+
ConnsAsyncClosing: 0
35+
Scoreboard: ________________________________W_________________....................................................................................................

‎check-plugins/apache-httpd-status/unit-test/stdout/debian10-httpd-2.4.59-event-ext-on-3‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
localhost
2+
ServerVersion: Apache/2.4.59 (Debian)
3+
ServerMPM: event
4+
Server Built: 2024-05-24T22:36:21
5+
CurrentTime: Monday, 13-Apr-2026 08:55:03 UTC
6+
RestartTime: Monday, 13-Apr-2026 08:54:55 UTC
7+
ParentServerConfigGeneration: 1
8+
ParentServerMPMGeneration: 0
9+
ServerUptimeSeconds: 7
10+
ServerUptime: 7 seconds
11+
Load1: 1.88
12+
Load5: 1.67
13+
Load15: 1.38
14+
Total Accesses: 77
15+
Total kBytes: 24
16+
Total Duration: 12
17+
CPUUser: 0
18+
CPUSystem: .01
19+
CPUChildrenUser: 0
20+
CPUChildrenSystem: 0
21+
CPULoad: .142857
22+
Uptime: 7
23+
ReqPerSec: 11
24+
BytesPerSec: 3510.86
25+
BytesPerReq: 319.169
26+
DurationPerReq: .155844
27+
BusyWorkers: 1
28+
GracefulWorkers: 0
29+
IdleWorkers: 49
30+
Processes: 2
31+
Stopping: 0
32+
ConnsTotal: 0
33+
ConnsAsyncWriting: 0
34+
ConnsAsyncKeepAlive: 0
35+
ConnsAsyncClosing: 0
36+
Scoreboard: _____________W____________________________________....................................................................................................

‎check-plugins/apache-httpd-status/unit-test/stdout/debian11-httpd-2.4.66-event-ext-off‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
localhost
2+
ServerVersion: Apache/2.4.66 (Debian)
3+
ServerMPM: event
4+
Server Built: 2026-01-24T16:41:02
5+
CurrentTime: Monday, 13-Apr-2026 08:53:56 UTC
6+
RestartTime: Monday, 13-Apr-2026 08:53:53 UTC
7+
ParentServerConfigGeneration: 1
8+
ParentServerMPMGeneration: 0
9+
ServerUptimeSeconds: 3
10+
ServerUptime: 3 seconds
11+
Load1: 3.23
12+
Load5: 1.78
13+
Load15: 1.40
14+
BusyWorkers: 1
15+
GracefulWorkers: 0
16+
IdleWorkers: 49
17+
Processes: 2
18+
Stopping: 0
19+
ConnsTotal: 0
20+
ConnsAsyncWaitIO: 0
21+
ConnsAsyncWriting: 0
22+
ConnsAsyncKeepAlive: 0
23+
ConnsAsyncClosing: 0
24+
Scoreboard: _______________W__________________________________....................................................................................................

‎check-plugins/apache-httpd-status/unit-test/stdout/debian11-httpd-2.4.66-event-ext-on-1‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
localhost
2+
ServerVersion: Apache/2.4.66 (Debian)
3+
ServerMPM: event
4+
Server Built: 2026-01-24T16:41:02
5+
CurrentTime: Monday, 13-Apr-2026 08:53:12 UTC
6+
RestartTime: Monday, 13-Apr-2026 08:53:08 UTC
7+
ParentServerConfigGeneration: 1
8+
ParentServerMPMGeneration: 0
9+
ServerUptimeSeconds: 3
10+
ServerUptime: 3 seconds
11+
Load1: 2.84
12+
Load5: 1.51
13+
Load15: 1.30
14+
Total Accesses: 25
15+
Total kBytes: 7
16+
Total Duration: 4
17+
CPUUser: 0
18+
CPUSystem: 0
19+
CPUChildrenUser: 0
20+
CPUChildrenSystem: 0
21+
Uptime: 3
22+
ReqPerSec: 8.33333
23+
BytesPerSec: 2389.33
24+
BytesPerReq: 286.72
25+
DurationPerReq: .16
26+
BusyWorkers: 1
27+
GracefulWorkers: 0
28+
IdleWorkers: 49
29+
Processes: 2
30+
Stopping: 0
31+
ConnsTotal: 0
32+
ConnsAsyncWaitIO: 0
33+
ConnsAsyncWriting: 0
34+
ConnsAsyncKeepAlive: 0
35+
ConnsAsyncClosing: 0
36+
Scoreboard: _____________________W____________________________....................................................................................................

‎check-plugins/apache-httpd-status/unit-test/stdout/debian11-httpd-2.4.66-event-ext-on-2‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
localhost
2+
ServerVersion: Apache/2.4.66 (Debian)
3+
ServerMPM: event
4+
Server Built: 2026-01-24T16:41:02
5+
CurrentTime: Monday, 13-Apr-2026 08:53:14 UTC
6+
RestartTime: Monday, 13-Apr-2026 08:53:08 UTC
7+
ParentServerConfigGeneration: 1
8+
ParentServerMPMGeneration: 0
9+
ServerUptimeSeconds: 5
10+
ServerUptime: 5 seconds
11+
Load1: 2.85
12+
Load5: 1.53
13+
Load15: 1.30
14+
Total Accesses: 51
15+
Total kBytes: 15
16+
Total Duration: 8
17+
CPUUser: 0
18+
CPUSystem: 0
19+
CPUChildrenUser: 0
20+
CPUChildrenSystem: 0
21+
Uptime: 5
22+
ReqPerSec: 10.2
23+
BytesPerSec: 3072
24+
BytesPerReq: 301.176
25+
DurationPerReq: .156863
26+
BusyWorkers: 1
27+
GracefulWorkers: 0
28+
IdleWorkers: 49
29+
Processes: 2
30+
Stopping: 0
31+
ConnsTotal: 0
32+
ConnsAsyncWaitIO: 0
33+
ConnsAsyncWriting: 0
34+
ConnsAsyncKeepAlive: 0
35+
ConnsAsyncClosing: 0
36+
Scoreboard: ___________________________________________W______....................................................................................................

0 commit comments

Comments
 (0)