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.

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

Jump to bottom

fix: use require instead of t.Fatal(err) in tests/e2e package #18821

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: use require instead of t.Fatal(err) in tests/e2e package #18821

wants to merge 1 commit into from

Conversation

mmorel-35
Copy link
Contributor

This uses testify instead of testing for t.Fatal calls

@k8s-ci-robot
Copy link

Hi @mmorel-35. Thanks for your PR.

I'm waiting for a etcd-io member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@mmorel-35 mmorel-35 force-pushed the tests/e2e/testifier/require-error branch from c17a82e to ba00f4b Compare November 1, 2024 11:29
@mmorel-35
Copy link
Contributor Author

/assign @spzala

@mmorel-35 mmorel-35 force-pushed the tests/e2e/testifier/require-error branch from ba00f4b to c3c31ee Compare November 1, 2024 11:45
@codecov-commenter
Copy link

codecov-commenter commented Nov 1, 2024 •
edited by codecov bot
Loading

Codecov Report

Attention: Patch coverage is 25.00000% with 6 lines in your changes missing coverage. Please review.

Project coverage is 68.74%. Comparing base (1ee6598) to head (e82dfcc).
Report is 83 commits behind head on main.

❗ Current head e82dfcc differs from pull request most recent head 4e5c16d

Please upload reports for the commit 4e5c16d to get more accurate results.

Files with missing lines Patch % Lines
etcdctl/ctlv3/command/printer.go 0.00% 3 Missing ⚠️
etcdctl/ctlv3/command/check.go 0.00% 2 Missing ⚠️
etcdutl/etcdutl/snapshot_command.go 0.00% 1 Missing ⚠️
Additional details and impacted files
Files with missing lines Coverage Δ
etcdctl/ctlv3/command/elect_command.go 0.00% <ø> (ø)
etcdctl/ctlv3/command/ep_command.go 0.00% <ø> (ø)
etcdctl/ctlv3/command/lease_command.go 0.00% <ø> (ø)
etcdctl/ctlv3/command/printer_fields.go 0.00% <ø> (ø)
etcdctl/ctlv3/command/printer_simple.go 0.00% <ø> (ø)
etcdctl/ctlv3/command/printer_table.go 0.00% <ø> (ø)
etcdctl/ctlv3/command/snapshot_command.go 0.00% <ø> (ø)
etcdctl/ctlv3/command/user_command.go 0.00% <ø> (ø)
etcdctl/ctlv3/ctl.go 0.00% <ø> (ø)
etcdutl/ctl.go 0.00% <ø> (ø)
... and 8 more

... and 19 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #18821      +/-   ##
==========================================
+ Coverage   68.70%   68.74%   +0.04%     
==========================================
  Files         420      420              
  Lines       35531    35532       +1     
==========================================
+ Hits        24413    24428      +15     
+ Misses       9687     9681       -6     
+ Partials     1431     1423       -8

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1ee6598...4e5c16d. Read the comment docs.

@mmorel-35 mmorel-35 force-pushed the tests/e2e/testifier/require-error branch from c3c31ee to b73c4c4 Compare November 1, 2024 11:57
@mmorel-35 mmorel-35 force-pushed the tests/e2e/testifier/require-error branch 2 times, most recently from 7745c1a to 7c6e774 Compare November 1, 2024 12:10
@mmorel-35
Copy link
Contributor Author

/assign @ahrtr

@ahrtr
Copy link
Member

ahrtr commented Nov 1, 2024

/ok-to-test

@mmorel-35 mmorel-35 force-pushed the tests/e2e/testifier/require-error branch 5 times, most recently from 90e32b0 to 14cea3e Compare November 7, 2024 21:18
@mmorel-35 mmorel-35 force-pushed the tests/e2e/testifier/require-error branch 4 times, most recently from 9fe95ef to 61fe9b6 Compare November 9, 2024 21:27
@mmorel-35 mmorel-35 force-pushed the tests/e2e/testifier/require-error branch from 61fe9b6 to 2ad0b0b Compare November 9, 2024 21:42
@mmorel-35 mmorel-35 force-pushed the tests/e2e/testifier/require-error branch from 2ad0b0b to 66b2a10 Compare November 9, 2024 21:52
@mmorel-35 mmorel-35 force-pushed the tests/e2e/testifier/require-error branch from 66b2a10 to a8474d6 Compare November 9, 2024 21:58
@mmorel-35 mmorel-35 force-pushed the tests/e2e/testifier/require-error branch from a8474d6 to 4e5c16d Compare November 9, 2024 22:01
@ahrtr
Copy link
Member

ahrtr commented Nov 25, 2024

This PR is just mechanical changes, but we love small PRs. I will let this PR in, but please try to submit small PR , i.e. < 100 lines of code change as much as you can next time. Thanks.

@ivanvc
Copy link
Member

ivanvc commented Nov 25, 2024

Question: do all of these changes come from this specific linter? There are some formatting changes that look unrelated, but I may be wrong.

fuweid
fuweid approved these changes Nov 26, 2024
View reviewed changes
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

Basically, it looks good.

The pull requests include refactors, for example,

  • var => :=
  • Two lines => one line
  • Adding empty line

For reviewer, if non-related change is small, it's easy to be accepted and review
However, there are too many lines changed not related to that using requires.
My suggestion is that if linter doesn't blame, just keep it as it is and file other pull request for that.

tests/e2e/v3_curl_cluster_test.go
@@ -59,8 +57,7 @@ func testCurlV3ClusterOperations(cx ctlCtx) {
var newMemberIDStr string
for _, m := range members {
mObj := m.(map[string]any)
pURLs, _ := mObj["peerURLs"]
pURL := pURLs.([]any)[0].(string)
pURL := mObj["peerURLs"].([]any)[0].(string)
Copy link
Member

Choose a reason for hiding this comment

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

I think it's not related to your change. It's hard to scan all the changes like this, at least to me, even if the change looks fine.

tests/e2e/http_health_check_test.go
url: "/readyz",
expectedStatusCode: http.StatusOK,
expectedRespSubStrings: []string{`ok`},
var defaultHealthCheckConfigs = []healthCheckConfig{
Copy link
Member

Choose a reason for hiding this comment

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

it seems not related to this change.

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: fuweid, mmorel-35
Once this PR has been reviewed and has the lgtm label, please ask for approval from ahrtr. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mmorel-35 mmorel-35 marked this pull request as draft November 27, 2024 06:14
@mmorel-35
Copy link
Contributor Author

The formatting shouldn't be part of this PR. I hold on this to apply gofumpt first

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahrtr ahrtr ahrtr left review comments

@fuweid fuweid fuweid approved these changes

@ivanvc ivanvc Awaiting requested review from ivanvc

@jmhbnz jmhbnz Awaiting requested review from jmhbnz

Assignees

@spzala spzala

@ahrtr ahrtr

Labels
area/testing do-not-merge/work-in-progress ok-to-test size/XXL
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mmorel-35 @k8s-ci-robot @codecov-commenter @ahrtr @ivanvc @fuweid @spzala