-
Notifications
You must be signed in to change notification settings - Fork 56
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
e2e: Fix improper use of formatting #1622
base: main
Are you sure you want to change the base?
e2e: Fix improper use of formatting #1622
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thansk @alonsofabila-dev!
Few issues:
-
Use %q instead of %s
-
No need to split to commits by file, you can squash the commits to single commit.
-
Add this header to the commit message:
Fixes: #1618
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One more thing - not clear what is the (chore)
prefix. Check recent commits for the style used in this project.
34cbef2
to
9d4bce6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The actual change look good now, but we have 3 commits for for the same logical change. We want to have a single commit in git history for this issue.
Replacing %s with %q can be considered a different change, and maybe it is better done for the entire e2e package. This will be more work since lot of code use string concatenation ("a " + b + " c") instead of formatting which makes it harder to quote values.
To keep this PR simple and complete it quickly, lets remove the last commit and work on quoting later.
The first 2 commits should be squashed using git rebase. If you never did this see #1623.
The commit message have headers (like Signed-off-by: alonso fabila [email protected]). We want another header with (Fixes: #1618). You add the header as the commit message title in the last commit.
8489534
to
2262579
Compare
donde |
@alonsofabila-dev thanks for the update. If you don't mind I'll fix the commit message myself. |
2262579
to
59a9b36
Compare
@alonsofabila-dev I push another version with some minor changes:
diff --git a/e2e/dractions/retry.go b/e2e/dractions/retry.go
index dddcd38e..cb4a285f 100644
--- a/e2e/dractions/retry.go
+++ b/e2e/dractions/retry.go
@@ -206,7 +206,7 @@ func waitDRPCDeleted(client client.Client, namespace string, name string) error
}
if time.Since(startTime) > time.Second*time.Duration(util.Timeout) {
- return fmt.Errorf(fmt.Sprintf("drpc %q is not deleted yet before timeout, fail", name))
+ return fmt.Errorf("drpc %q is not deleted yet before timeout, fail", name)
}
time.Sleep(time.Second * time.Duration(util.TimeInterval))
|
@alonsofabila-dev git grep show other instances that you did not fix:
|
59a9b36
to
aabe093
Compare
done |
@alonsofabila-dev please rebase on main, some of the changes already fixed by another pr merged just now. |
@alonsofabila-dev I asked to rebase on main, but you merged it - this is not the same. We want to have clean linear history in git without merge commits. The way to update your PR is to use:
This should be done each time you push changes, to make sure your change is tested on top of latest version. |
554078d
to
e949660
Compare
sorry for my mistake, I have now done as you mentioned. but keep sayin that there are conflicts, and when i rebase on main says that its up to date, even though i see they are not the same |
e2e: Fix improper use of formatting When using fmt.Errorf(), we don't need to format the message with fmt.Sprintf(). Fixes: RamenDR#1618 Signed-off-by: alonso fabila <[email protected]>
e949660
to
57ad0f9
Compare
@alonsofabila-dev You rebased, but you had to "pick" only your commit. I clean up and resolved the conflicts. |
thanks |
When using fmt.Errorf(), we don't need to format the message with
fmt.Sprintf().
Fixes #1618