Skip to content

sdks/python/scripts: fix posargs for run_pytest.sh #35733

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
damccorm merged 8 commits into from
Jul 30, 2025
Merged

sdks/python/scripts: fix posargs for run_pytest.sh #35733

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
344a9ce
sdks/python/scripts: fix posargs for `run_pytest.sh`
mohamedawnallah Jul 30, 2025
3a94a87
sdks/python/scripts: isolate test paths from pyargs
mohamedawnallah Jul 30, 2025
4d5f702
sdks/python/scripts: address some gemini feedback
mohamedawnallah Jul 30, 2025
864683c
.github: trigger postcommit python
mohamedawnallah Jul 30, 2025
b819b70
Merge remote-tracking branch 'upstream/master' into fixPytestScript
mohamedawnallah Jul 30, 2025
0f6d8c0
.github: trigger postcommit python
mohamedawnallah Jul 30, 2025
151e278
.github+scripts: handle quotes properly for `run_pytest.sh`
mohamedawnallah Jul 30, 2025
f53d37b
.github: trigger postcommit python
mohamedawnallah Jul 30, 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
10 changes: 5 additions & 5 deletions sdks/python/scripts/run_pytest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ marker_regex="-m\s+('[^']+'|\"[^\"]+\"|[^ ]+)"
user_marker=""

# Isolate the user-provided -m argument (matching only).
if [[ $pytest_args =~ "-m" ]]; then
if [[ $posargs =~ "-m" ]]; then
# Extract the marker value using the defined regex.
user_marker=$(echo "$pytest_args" | sed -nE "s/.*$marker_regex.*/\1/p")
user_marker=$(echo "$posargs" | sed -nE "s/.*$marker_regex.*/\1/p")
fi

# Remove the -m argument from pytest_args (substitution only).
# Remove the -m argument from posargs (substitution only).
if [[ -n $user_marker ]]; then
pytest_args=$(echo "$pytest_args" | sed -E "s/$marker_regex//")
posargs=$(echo "$posargs" | sed -E "s/$marker_regex//")
fi
Comment thread
mohamedawnallah marked this conversation as resolved.
Outdated

# Combine user-provided marker with script's internal logic.
Expand All @@ -63,7 +63,7 @@ if [[ -n $user_marker ]]; then
fi

# Run tests in parallel.
echo "Running parallel tests with: pytest -m \"$marker_for_parallel_tests\" $pytest_args"
echo "Running parallel tests with: pytest -m \"$marker_for_parallel_tests\" $posargs"
Comment thread
mohamedawnallah marked this conversation as resolved.
Outdated
pytest -v -rs -o junit_suite_name=${envname} \
--junitxml=pytest_${envname}.xml -m "$marker_for_parallel_tests" -n 6 --import-mode=importlib ${pytest_args} --pyargs ${posargs}
Comment thread
mohamedawnallah marked this conversation as resolved.
Outdated
status1=$?
Expand Down
Loading