Skip to content

Run test servers with sudo when running on macos-15 #19252

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
oscarsj merged 5 commits into from
Apr 8, 2025
Merged

Run test servers with sudo when running on macos-15 #19252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5e1b25
use sudo nice for running maven test server
oscarsj Apr 8, 2025
e49fb83
Update java/ql/integration-tests/java/buildless-inherit-trust-store/t…
oscarsj Apr 8, 2025
3b56f95
use only sudo for running maven test server (remove nice)
oscarsj Apr 8, 2025
1eb4a1a
Update java/ql/integration-tests/java/buildless-snapshot-repository/t…
oscarsj Apr 8, 2025
afe3e53
Update java/ql/integration-tests/java/buildless-inherit-trust-store/t…
oscarsj Apr 8, 2025
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
8 changes: 7 additions & 1 deletion java/ql/integration-tests/java/buildless-inherit-trust-store/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import subprocess
import os
import runs_on


def test(codeql, java, cwd):
# This serves the "repo" directory on https://locahost:4443
repo_server_process = subprocess.Popen(["python3", "../server.py"], cwd="repo")
command = ["python3", "../server.py"]
if runs_on.github_actions and runs_on.posix:
Copy link

Copilot AI Apr 8, 2025

Choose a reason for hiding this comment

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

The condition does not strictly check for the 'macos-15' environment as referenced in the PR title. Consider updating the condition to explicitly target macos-15 to avoid potential unintended side-effects on other POSIX environments.

Suggested change
if runs_on.github_actions and runs_on.posix:
if runs_on.github_actions and runs_on.posix and runs_on.macos_version == "15":

Copilot uses AI. Check for mistakes.
# On GitHub Actions, we saw the server timing out while running in parallel with other tests
# we work around that by running it with higher permissions
command = ["sudo"] + command
repo_server_process = subprocess.Popen(command, cwd="repo")
certspath = cwd / "jdk8_shipped_cacerts_plus_cert_pem"
# If we override MAVEN_OPTS, we'll break cross-test maven isolation, so we need to append to it instead
maven_opts = os.environ["MAVEN_OPTS"] + f" -Djavax.net.ssl.trustStore={certspath}"
Expand Down
5 changes: 3 additions & 2 deletions java/ql/integration-tests/java/buildless-snapshot-repository/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ def test(codeql, java):
# This serves the "repo" directory on http://localhost:9427
command = ["python3", "-m", "http.server", "9427", "-b", "localhost"]
if runs_on.github_actions and runs_on.posix:
# On GitHub Actions, we try to run the server with higher priority
command = ["sudo", "nice", "-n", "10"] + command
# On GitHub Actions, we saw the server timing out while running in parallel with other tests
# we work around that by running it with higher permissions
command = ["sudo"] + command
repo_server_process = subprocess.Popen(
command, cwd="repo"
)
Expand Down