Skip to content

CI: run everything pytest-able and various cleanups - #701

Open
notroj wants to merge 5 commits into
apache:trunkfrom
notroj:ci-more-pytesting
Open

CI: run everything pytest-able and various cleanups#701
notroj wants to merge 5 commits into
apache:trunkfrom
notroj:ci-more-pytesting

Conversation

@notroj

@notroj notroj commented Aug 1, 2026

Copy link
Copy Markdown
Collaborator

No description provided.

asf-gitbox-commits pushed a commit that referenced this pull request Aug 4, 2026
@notroj
* test/pytest_suite: Import/translate gitignore from the svn:ignore o…
f8e969e 
…rignals. [skip ci]

GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936869 13f79535-47bb-0310-9956-ffa450edef68
asf-gitbox-commits pushed a commit that referenced this pull request Aug 4, 2026
@notroj
* Makefile.in (check-all-pytest): New target: run both Python test
3bcb8c8 
  suites via test/run-all-tests.sh against the check/ build tree.
  (PHONY_TARGETS): Add check-pytest and check-all-pytest.

* test/run-all-tests.sh: Document PYHTTPD_CONFIG.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936870 13f79535-47bb-0310-9956-ffa450edef68
asf-gitbox-commits pushed a commit that referenced this pull request Aug 4, 2026
@notroj
* test/pytest_suite/apache_pytest/fpm.py (PhpFpm.generate_conf): Set
d6c9c13 
register_argc_argv so PHP tests see $_SERVER['argc']/['argv'] under
FPM, which mod_php's config for this never actually reached.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936871 13f79535-47bb-0310-9956-ffa450edef68
asf-gitbox-commits pushed a commit that referenced this pull request Aug 4, 2026
@notroj
* test/pytest_suite/tests/t/ab/test_base.py (_ab_path): Don't
211912c 
  resolve() the httpd path before deriving ab's; it follows the
  check/bin/httpd symlink out of the check/ tree, so ab was never
  found there.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936872 13f79535-47bb-0310-9956-ffa450edef68
asf-gitbox-commits pushed a commit that referenced this pull request Aug 4, 2026
@notroj
* .gitignore: Ignore the "-ng" variants of support/ scripts. [skip ci]
23253ea 
Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936873 13f79535-47bb-0310-9956-ffa450edef68
asf-gitbox-commits pushed a commit that referenced this pull request Aug 4, 2026
@notroj
* .github/workflows/linux.yml: Group the APR/APR-util version-variant
0998d3e 
  jobs together. No functional change. [skip ci]

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936874 13f79535-47bb-0310-9956-ffa450edef68
asf-gitbox-commits pushed a commit that referenced this pull request Aug 4, 2026
@notroj
* .github/workflows/linux.yml: Add APR 1.7.x, APR-util 1.6.x job.
1c79d30 
Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936875 13f79535-47bb-0310-9956-ffa450edef68
@notroj
notroj force-pushed the ci-more-pytesting branch 2 times, most recently from a478c46 to 3e0a8ae Compare August 7, 2026 13:24
asf-gitbox-commits pushed a commit that referenced this pull request Aug 7, 2026
@notroj
* modules/ssl/ssl_engine_init.c (ssl_init_ctx_crl): Remove unused
e96ddcf 
  variable.

Fixes: 01a5969 (SVN r1936849)
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936968 13f79535-47bb-0310-9956-ffa450edef68
asf-gitbox-commits pushed a commit that referenced this pull request Aug 7, 2026
@notroj
* test/pytest_suite/.gitignore: Ignore generated .htaccess files,
bd16653 
  t/conf/cacheroot/, t/htdocs/modules/autoindex2/,
  t/htdocs/modules/substitute/test.txt, and t/state/.

* test/pytest_suite/t/htdocs/apache/cfg_getline/.htaccess,
  authz_core/a/.htaccess, authz_core/a/b/.htaccess,
  authz_core/a/b/c/.htaccess: Remove stale generated content that
  had been committed by mistake.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936969 13f79535-47bb-0310-9956-ffa450edef68
asf-gitbox-commits pushed a commit that referenced this pull request Aug 7, 2026
@notroj
* test/pyhttpd/env.py (has_h2load): Verify h2load actually resolves,
8d657c6 
  instead of just checking the config string is non-empty.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936973 13f79535-47bb-0310-9956-ffa450edef68
asf-gitbox-commits pushed a commit that referenced this pull request Aug 7, 2026
@notroj
Fix false negatives checking error_log with test_proxy_beacon: [skip ci]
de77830 
* test/pytest_suite/conftest.py (framework): Record error_log's size
  before httpd starts, as session_log_start.

* test/pytest_suite/tests/t/modules/test_proxy_beacon.py
  (test_proxy_beacon): Scope the "added backend" log check to
  session_log_start instead of the per-test window or byte 0.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936976 13f79535-47bb-0310-9956-ffa450edef68
@notroj
notroj force-pushed the ci-more-pytesting branch from aa66436 to 9a0a827 Compare August 7, 2026 15:51
notroj added a commit to notroj/httpd that referenced this pull request Aug 7, 2026
@notroj
* test/pytest_suite: Import/translate gitignore from the svn:ignore o…
e56d925 
…rignals. [skip ci]

GitHub: PR apache#701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936869 13f79535-47bb-0310-9956-ffa450edef68
notroj added a commit to notroj/httpd that referenced this pull request Aug 7, 2026
@notroj
* Makefile.in (check-all-pytest): New target: run both Python test
611b6d9 
  suites via test/run-all-tests.sh against the check/ build tree.
  (PHONY_TARGETS): Add check-pytest and check-all-pytest.

* test/run-all-tests.sh: Document PYHTTPD_CONFIG.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR apache#701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936870 13f79535-47bb-0310-9956-ffa450edef68
notroj added a commit to notroj/httpd that referenced this pull request Aug 7, 2026
@notroj
* test/pytest_suite/apache_pytest/fpm.py (PhpFpm.generate_conf): Set
4548849 
register_argc_argv so PHP tests see $_SERVER['argc']/['argv'] under
FPM, which mod_php's config for this never actually reached.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR apache#701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936871 13f79535-47bb-0310-9956-ffa450edef68
notroj added a commit to notroj/httpd that referenced this pull request Aug 7, 2026
@notroj
* test/pytest_suite/tests/t/ab/test_base.py (_ab_path): Don't
1030dab 
  resolve() the httpd path before deriving ab's; it follows the
  check/bin/httpd symlink out of the check/ tree, so ab was never
  found there.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR apache#701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936872 13f79535-47bb-0310-9956-ffa450edef68
notroj added a commit to notroj/httpd that referenced this pull request Aug 7, 2026
@notroj
* .gitignore: Ignore the "-ng" variants of support/ scripts. [skip ci]
b7acb42 
Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR apache#701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936873 13f79535-47bb-0310-9956-ffa450edef68
notroj added a commit to notroj/httpd that referenced this pull request Aug 7, 2026
@notroj
* .github/workflows/linux.yml: Group the APR/APR-util version-variant
ee95322 
  jobs together. No functional change. [skip ci]

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR apache#701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936874 13f79535-47bb-0310-9956-ffa450edef68
notroj added a commit to notroj/httpd that referenced this pull request Aug 7, 2026
@notroj
* .github/workflows/linux.yml: Add APR 1.7.x, APR-util 1.6.x job.
eb8d08b 
Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR apache#701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936875 13f79535-47bb-0310-9956-ffa450edef68
notroj added 5 commits August 10, 2026 11:21
@notroj
test/modules/aaa: Add a pytest suite for mod_auth_digest.
822d825 
Covers RFC 2617 challenge/response, nonce lifecycle (tamper/stale/
expiry/one-time), AuthDigestNcCheck, AuthDigestDomain, provider
fallback, and config-time validation.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
@notroj
Consolidate Linux CI's pytest-based test running into TEST_PYTEST.
94c98c7 
* test/travis_run_linux.sh: Replace TEST_CORE/TEST_PROXY/TEST_H2 with
one TEST_PYTEST block, running `make check-all-pytest` over every
test/modules/*/ suite except modules/md (needs an ACME/pebble server
not available here). Keep the old TEST_MD/pebble logic for reference,
under a conditional that is never set.

* .github/workflows/linux.yml: Replace the "HTTP/2 test suite" job and
the disabled "ACME test suite" job with one "Python pytest test
suites" job setting TEST_PYTEST=1. Drop TEST_INSTALL: check-all-pytest
tests the check/ build tree directly. Drop the python3-pytest/
python3-cryptography/etc. packages, since both suites now manage their
own dependencies via uv; install uv from the Ubuntu package instead.
Capture the new suites' error logs as failure artifacts.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
@notroj
* .github/workflows/linux.yml: Install uv via pipx, not apt: uv isn't
42d9473 
an Ubuntu package, so the shared "Install prerequisites" apt-get
command was failing outright.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
@notroj
* .github/workflows/linux.yml: Set TEST_PYTEST=1 for the UBSan, ASan,
e7bafe2 
  and ASan pool-debug jobs. Move pipx and curl into the always-installed
  base packages; add nghttp2-client to the ASan jobs.

* test/travis_run_linux.sh: Exclude modules/http2 from the pytest run
  when mod_http2.so wasn't built.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
@notroj
* test/pytest_suite/apache_pytest/config.py (_build_vars): Add
d180293 
  @STATEDIR@ config template variable.

* test/pytest_suite/t/conf/cache.conf.in, tests/t/modules/test_cache.py:
  Use @STATEDIR@/cacheroot/ for CacheRoot, instead of t/conf/cacheroot.

* test/pytest_suite/.gitignore: Drop the now-obsolete
  t/conf/cacheroot/ entry.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
@notroj
notroj force-pushed the ci-more-pytesting branch from 9a0a827 to d180293 Compare August 10, 2026 10:23
asf-gitbox-commits pushed a commit that referenced this pull request Aug 10, 2026
@notroj
* test/pytest_suite/apache_pytest/config.py (_build_vars): Add
e1ba712 
  @STATEDIR@ config template variable.

* test/pytest_suite/t/conf/cache.conf.in, tests/t/modules/test_cache.py:
  Use @STATEDIR@/cacheroot/ for CacheRoot, instead of t/conf/cacheroot.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1937025 13f79535-47bb-0310-9956-ffa450edef68
asf-gitbox-commits pushed a commit that referenced this pull request Aug 10, 2026
@notroj
Consolidate Linux CI pytest-based test execution:
d53bd3d 
* test/travis_run_linux.sh: Replace TEST_CORE/TEST_PROXY/TEST_H2 with
  one TEST_PYTEST block, running `make check-all-pytest` over every
  test/modules/*/ suite except modules/md (needs an ACME/pebble server
  not available here) and mod_http2 if not built.

* .github/workflows/linux.yml: Replace the "HTTP/2 test suite" job and
  the disabled "ACME test suite" job with one "Python pytest test
  suites" job setting TEST_PYTEST=1. Drop TEST_INSTALL:
  check-all-pytest tests the check/ build tree directly. Drop the
  python3-pytest/ python3-cryptography/etc. packages, since both
  suites now manage their own dependencies via uv; install uv via pipx
  instead.  Set TEST_PYTEST=1 for the UBSan, ASAN jobs.

* test/README.ci: Updated.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1937026 13f79535-47bb-0310-9956-ffa450edef68
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@notroj