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

test: fix e2e tests broken in various ways #2078

Merged
merged 5 commits into from
Jul 24, 2024
Merged

test: fix e2e tests broken in various ways #2078

merged 5 commits into from
Jul 24, 2024

Conversation

bermuell
Copy link
Contributor

@bermuell bermuell commented Jul 22, 2024

Description

fix e2e tests broken due to various changes e.g.

  • cli command changes (query for reward in SDK module),
  • error message, checked in tests

Added imrovement for compatiblity tests to identify ICS version from git reference in a more generic way.


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • Included the correct type prefix in the PR title
  • Targeted the correct branch (see PR Targeting)
  • Provided a link to the relevant issue or specification
  • Reviewed "Files changed" and left comments if necessary
  • Confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • Confirmed the correct type prefix in the PR title
  • Confirmed all author checklist items have been addressed
  • Confirmed that this PR does not change production code

Summary by CodeRabbit

  • Chores

    • Updated the .gitignore file to ignore files starting with __debug_, improving repository cleanliness.
  • Bug Fixes

    • Enhanced command execution output by adding a verbose parameter to several command execution methods, offering more detailed logs.
  • Refactor

    • Simplified command execution by removing the ExecuteCommandWithVerbosity function and integrating its logic directly into the existing ExecuteCommand function.
    • Improved error handling and version tag retrieval in the getIcsVersion function to enhance flexibility and robustness.

@bermuell bermuell self-assigned this Jul 22, 2024
@github-actions github-actions bot added the C:Testing Assigned automatically by the PR labeler label Jul 22, 2024
@bermuell bermuell requested review from sainoe and MSalopek July 22, 2024 14:09
@bermuell bermuell marked this pull request as ready for review July 22, 2024 14:11
@bermuell bermuell requested a review from a team as a code owner July 22, 2024 14:11
Copy link
Contributor

coderabbitai bot commented Jul 22, 2024

Walkthrough

Walkthrough

The recent changes enhance maintainability and usability by refining command execution methods and improving error handling. Key updates include adding a verbosity parameter for detailed command outputs, dynamically retrieving version tags from the Git repository, and implementing robust error handling. These modifications streamline command execution and ensure consistent error messaging, contributing to a cleaner and more efficient codebase.

Changes

File Change Summary
.gitignore Added __debug_* to ignore debug-related files, improving repository cleanliness.
tests/e2e/actions.go, tests/e2e/state.go, tests/e2e/v4/state.go Updated ExecuteCommand calls to include a verbose parameter for enhanced command output during chain operations, simplifying execution flow.
tests/e2e/config.go Modified getIcsVersion to check for an empty reference or match VLatest, and dynamically retrieve version tags from Git, improving flexibility and error handling.
tests/e2e/steps_compatibility.go Added import for providertypes and updated error message handling for validation scenarios, enhancing maintainability.
tests/e2e/testlib/utils.go Removed ExecuteCommandWithVerbosity, integrating its logic into ExecuteCommand, simplifying command execution while retaining verbosity handling.

Recent review details

Configuration used: .coderabbit.yml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between ef557b1 and f60b7ca.

Files selected for processing (1)
  • tests/e2e/config.go (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • tests/e2e/config.go

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>.
    • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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 as 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 resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

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.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

Comment on lines +147 to +148
icsVersions := strings.Split(string(out), "\n")
for _, tag := range icsVersions {
Copy link
Contributor

Choose a reason for hiding this comment

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

Improve error handling for Git command execution.

The function currently panics if the Git command fails. Consider improving error handling by logging the error and returning a more descriptive error message.

- if err != nil {
-   panic(fmt.Sprintf("Error getting sorted tag list from git: %s", err.Error()))
+ if err != nil {
+   log.Printf("Error getting sorted tag list from git: %s", err.Error())
+   return ""
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
icsVersions := strings.Split(string(out), "\n")
for _, tag := range icsVersions {
icsVersions := strings.Split(string(out), "\n")
for _, tag := range icsVersions {
if err != nil {
log.Printf("Error getting sorted tag list from git: %s", err.Error())
return ""
}

Comment on lines +142 to +146
cmd := exec.Command("git", "tag", "-l", "--sort", "v:refname", "v*.?", "v*.?-lsm", "v*.??", "v*.??-lsm")
out, err := cmd.CombinedOutput()
if err != nil {
panic(fmt.Sprintf("Error getting sorted tag list from git: %s", err.Error()))
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Handle potential security risks with exec.Command.

The use of exec.Command to execute Git commands introduces potential security risks. Ensure that the inputs to exec.Command are sanitized and consider using a safer alternative if possible.

- cmd := exec.Command("git", "tag", "-l", "--sort", "v:refname", "v*.?", "v*.?-lsm", "v*.??", "v*.??-lsm")
+ cmd := exec.Command("git", "tag", "-l", "--sort", "v:refname", "v*.?", "v*.?-lsm", "v*.??", "v*.??-lsm")
+ cmd.Env = append(os.Environ(), "GIT_TERMINAL_PROMPT=0")

Committable suggestion was skipped due to low confidence.

Copy link
Contributor

@MSalopek MSalopek left a comment

Choose a reason for hiding this comment

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

LGTM

tests/e2e/config.go Outdated Show resolved Hide resolved
@sainoe
Copy link
Contributor

sainoe commented Jul 23, 2024

LGTM!
QQ: does this fix the changeover e2e test?

@sainoe sainoe self-requested a review July 23, 2024 12:07
Co-authored-by: Simon Noetzlin <[email protected]>
@bermuell
Copy link
Contributor Author

LGTM! QQ: does this fix the changeover e2e test?

no, will use a different PR for that

@bermuell bermuell enabled auto-merge July 24, 2024 13:10
@bermuell bermuell added this pull request to the merge queue Jul 24, 2024
Merged via the queue into main with commit 706fb44 Jul 24, 2024
15 of 16 checks passed
@bermuell bermuell deleted the bernd/fix-e2e branch July 24, 2024 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:Testing Assigned automatically by the PR labeler
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

3 participants