Skip to content

Updated so that tests that don't use the suexec module don't load it #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PaulLodge wants to merge 1 commit into
base: trunk
Choose a base branch
from
+9 −3
Open

Updated so that tests that don't use the suexec module don't load it #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions test/modules/core/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class CoreTestSetup(HttpdTestSetup):
def __init__(self, env: 'HttpdTestEnv'):
super().__init__(env=env)
self.add_source_dir(os.path.dirname(inspect.getfile(CoreTestSetup)))
self.add_modules(["cgid","include","userdir","suexec","headers"])

@covener covener Nov 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mod_headers is reasonable to leave in (notwithstanding that the CI failure might be showing that adding it back in didn't work?)

self.add_modules(["cgid","include"])


class CoreTestEnv(HttpdTestEnv):
Expand All @@ -22,4 +22,6 @@ def __init__(self, pytestconfig=None):
self.add_httpd_log_modules(["http", "core"])

def setup_httpd(self, setup: HttpdTestSetup = None):
super().setup_httpd(setup=CoreTestSetup(env=self))
if setup is None:
setup = CoreTestSetup(env=self)
super().setup_httpd(setup=setup)
6 changes: 5 additions & 1 deletion test/modules/core/test_005_userdir_headers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@
import pytest

from pyhttpd.conf import HttpdConf
from .env import HttpdTestEnv, CoreTestSetup

class TestUserdirHeaders:

@pytest.fixture(autouse=True, scope='class')
def _class_scope(self, env):
setup = CoreTestSetup(env=env)
setup.add_modules(["userdir","suexec","headers"])
env.setup_httpd(setup=setup)

userdir_base = os.path.join(env.server_dir, "htdocs", "userdir")

conf = HttpdConf(env, extras={
'base': f"""
UserDir "{userdir_base}/*/public_html"

<Directory "{userdir_base}/*/public_html">
AllowOverride FileInfo
Options +ExecCGI
Expand All @@ -26,6 +29,7 @@ def _class_scope(self, env):
conf.install()
assert env.apache_restart() == 0

@pytest.mark.skipif(condition=(not HttpdTestEnv.has_shared_module("suexec")), reason="Skipping as the suexec module hasn't been built and installed.")
def test_core_005_01_requestheader_note_rejected(self, env):
url = env.mkurl("http", "test1", "/~testuser/cgi-bin/test.cgi")
r = env.curl_get(url)
Expand Down
Loading