Skip to content
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.

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

Fix test regex for proxy error message #2307

Merged
merged 1 commit into from
Feb 2, 2025

Conversation

sbahar619
Copy link
Contributor

@sbahar619 sbahar619 commented Feb 2, 2025

Short description:

Fix test regex for proxy error message

More details:

The test was failing due to an incorrect regex
pattern in the expected error message.
The regex has been updated to match the correct
proxy-related error message format.
This ensures the test properly validates conflicting proxy settings and prevents false failures.

What this PR does / why we need it:

The test needs this update due to a previous PR that changed the log message format:
#2305

Which issue(s) this PR fixes:
Special notes for reviewer:
Bug:

Summary by CodeRabbit

  • Bug Fixes
    • Improved the clarity of error messaging for proxy configuration conflicts by specifying the relevant proxy settings.

The test was failing due to an incorrect regex
pattern in the expected error message.
The regex has been updated to match the correct
proxy-related error message format.
This ensures the test properly validates conflicting
proxy settings and prevents false failures.

Signed-off-by: Shahaf Bahar <[email protected]>
Copy link

coderabbitai bot commented Feb 2, 2025

Walkthrough

The changes modify the error message raised in the test_proxy_conflict_raises_value_error test case within tests/test_resources.py. The message now clarifies that the proxy conflict is due to the HTTPS_PROXY/HTTP_PROXY environment variables instead of the previously mentioned OPENSHIFT_PYTHON_WRAPPER_CLIENT_USE_PROXY. There are no modifications to logic, control flow, or error handling beyond this update.

Changes

File(s) Change Summary
tests/test_resources.py Updated error message in test_proxy_conflict_raises_value_error to specify HTTPS_PROXY/HTTP_PROXY for proxy conflicts.

Possibly related PRs

Suggested labels

size/XS, verified, branch-main

Suggested reviewers

  • rnetser
  • dbasunag

📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9966a42 and 0f7c3d8.

📒 Files selected for processing (1)
  • tests/test_resources.py (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: python-module-install
  • GitHub Check: tox
🔇 Additional comments (2)
tests/test_resources.py (2)

121-133: LGTM! The error message update accurately reflects the proxy conflict source.

The test case correctly verifies the behavior when there's a conflict between the proxy set in client configuration and the environment variables. The updated error message is more precise in identifying the source of the conflict.


130-131: Verify error message consistency with implementation.

Let's ensure the updated error message matches the actual error raised in the code.

✅ Verification successful

The error message in the test correctly matches the concatenated implementation.

  • The implementation in ocp_resources/resource.py uses two formatted string segments that, when combined, produce an error message identical in wording to that in the test.
  • The test in tests/test_resources.py properly expects the concatenated error message, ensuring consistency with the actual error raised.
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for the error message implementation
rg -A 2 "Conflicting proxy settings" --type py

Length of output: 652

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@redhat-qe-bot
Copy link
Contributor

Report bugs in Issues

The following are automatically added:

  • Add reviewers from OWNER file (in the root of the repository) under reviewers section.
  • Set PR size label.
  • New issue is created for the PR. (Closed when PR is merged/closed)
  • Run pre-commit if .pre-commit-config.yaml exists in the repo.

Available user actions:

  • To mark PR as WIP comment /wip to the PR, To remove it from the PR comment /wip cancel to the PR.
  • To block merging of PR comment /hold, To un-block merging of PR comment /hold cancel.
  • To mark PR as verified comment /verified to the PR, to un-verify comment /verified cancel to the PR.
    verified label removed on each new commit push.
  • To cherry pick a merged PR comment /cherry-pick <target branch to cherry-pick to> in the PR.
    • Multiple target branches can be cherry-picked, separated by spaces. (/cherry-pick branch1 branch2)
    • Cherry-pick will be started when PR is merged
  • To build and push container image command /build-and-push-container in the PR (tag will be the PR number).
    • You can add extra args to the Podman build command
      • Example: /build-and-push-container --build-arg OPENSHIFT_PYTHON_WRAPPER_COMMIT=<commit_hash>
  • To add a label by comment use /<label name>, to remove, use /<label name> cancel
  • To assign reviewers based on OWNERS file use /assign-reviewers
  • To check if PR can be merged use /check-can-merge
  • to assign reviewer to PR use /assign-reviewer @<reviewer>
Supported /retest check runs
  • /retest tox: Retest tox
  • /retest python-module-install: Retest python-module-install
  • /retest all: Retest all
Supported labels
  • hold
  • verified
  • wip
  • lgtm

@sbahar619
Copy link
Contributor Author

/verified

@myakove myakove merged commit b4c8748 into RedHatQE:main Feb 2, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants