Skip to content

Commit 2afdf01

Browse files
committed
test(apache-httpd-status): rewrite fixtures, use Red Hat stack, modernize run
Rename the opaque EXAMPLE01..08 fixtures to `<os>-httpd-<version>-<mpm>-ext-<on|off>[-<n>]` so the intent of each scenario is obvious at a glance, and replace the CentOS 8 captures with fresh RHEL 8 / 9 / 10 (httpd 2.4.37 / 2.4.62 / 2.4.63) captures taken from `registry.access.redhat.com/ubi{8,9,10}/ubi` containers. Each ExtendedStatus-On scenario carries the full three-call sequence that the plugin needs to progress through "Waiting for more data (1)" and "(3)" to its real output. Rewrite the `run` file from per-method `shell_exec` calls to the declarative SCENARIOS / `lib.lftest.run()` pattern the other plugins use, with a cache-DB reset between scenarios so they do not bleed into each other. Assertions are regex-based so re-captures do not have to match specific worker counts or byte totals. The old Fedora 34 captures are kept for their MPM coverage: one event MPM scenario, one worker MPM scenario (which does not emit ConnsTotal / ConnsAsync* and exercises the "field is missing" branches), and one worker MPM scenario that additionally lacks CPULoad.
1 parent f8b62b8 commit 2afdf01

29 files changed

+648
-310
lines changed

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

Lines changed: 261 additions & 185 deletions
Large diffs are not rendered by default.

check-plugins/apache-httpd-status/unit-test/stdout/EXAMPLE04a

Lines changed: 0 additions & 37 deletions
This file was deleted.

check-plugins/apache-httpd-status/unit-test/stdout/EXAMPLE04b

Lines changed: 0 additions & 37 deletions
This file was deleted.

check-plugins/apache-httpd-status/unit-test/stdout/EXAMPLE04c

Lines changed: 0 additions & 37 deletions
This file was deleted.

check-plugins/apache-httpd-status/unit-test/stdout/EXAMPLE05 renamed to check-plugins/apache-httpd-status/unit-test/stdout/fedora34-httpd-2.4.48-event-ext-off

File renamed without changes.

check-plugins/apache-httpd-status/unit-test/stdout/EXAMPLE06a renamed to check-plugins/apache-httpd-status/unit-test/stdout/fedora34-httpd-2.4.48-event-ext-on-1

File renamed without changes.

check-plugins/apache-httpd-status/unit-test/stdout/EXAMPLE06b renamed to check-plugins/apache-httpd-status/unit-test/stdout/fedora34-httpd-2.4.48-event-ext-on-2

File renamed without changes.

check-plugins/apache-httpd-status/unit-test/stdout/EXAMPLE06c renamed to check-plugins/apache-httpd-status/unit-test/stdout/fedora34-httpd-2.4.48-event-ext-on-3

File renamed without changes.

check-plugins/apache-httpd-status/unit-test/stdout/EXAMPLE07a renamed to check-plugins/apache-httpd-status/unit-test/stdout/fedora34-httpd-2.4.48-worker-ext-on-1

File renamed without changes.

check-plugins/apache-httpd-status/unit-test/stdout/EXAMPLE07b renamed to check-plugins/apache-httpd-status/unit-test/stdout/fedora34-httpd-2.4.48-worker-ext-on-2

File renamed without changes.

0 commit comments

Comments
 (0)