Skip to content

Allow "__DOMAIN__" placeholder in expect_effective_url #203

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

Merged
Salamandar merged 1 commit into from
Oct 31, 2025
Merged

Allow "__DOMAIN__" placeholder in expect_effective_url #203

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
14 changes: 9 additions & 5 deletions lib/curl_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,18 @@ def code_was_expected(code: int) -> bool:
raise ValueError("expect_return_code should be list or int")

errors = []
if expect_effective_url is None and "/yunohost/sso" in effective_url:

if expect_effective_url:
expect_effective_url = expect_effective_url.replace("__DOMAIN__", APP_DOMAIN)
if expect_effective_url != effective_url:
errors.append(
f"Ended up on URL '{effective_url}', but was expecting '{expect_effective_url}'"
)
elif "/yunohost/sso" in effective_url:
errors.append(
f"The request was redirected to yunohost's portal ({effective_url})"
)
if expect_effective_url and expect_effective_url != effective_url:
errors.append(
f"Ended up on URL '{effective_url}', but was expecting '{expect_effective_url}'"
)

if not code_was_expected(code):
errors.append(f"Got return code {code}, but was expecting {expect_return_code}")
if expect_title is None and "Welcome to nginx" in title:
Expand Down