-
Notifications
You must be signed in to change notification settings - Fork 38.6k
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 master_test flake #19195
Fix master_test flake #19195
Conversation
Labelling this PR as size/M |
33fe6b2
to
a0794a8
Compare
GCE e2e test build/test passed for commit 33fe6b2dd778a1d9dbefba04e709e682a830e091. |
GCE e2e test build/test passed for commit a0794a8ea53cbdfff912ed88d1df91833bcda130. |
@@ -150,7 +168,12 @@ func NewEtcdTestClientServer(t *testing.T) *EtcdTestServer { | |||
} | |||
server.Client, err = etcd.New(cfg) | |||
if err != nil { | |||
t.Errorf("Unexpected Error in NewEtcdTestClientServer (%v)", err) | |||
t.Errorf("Unexpected error in NewEtcdTestClientServer (%v)", err) | |||
defer server.Terminate(t) |
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.
What's the reason for defer here? Will terminating server before returning cause some races?
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.
consistency with what was before (6 lines below)
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.
Yeah - maybe we should remove it from both those places then?
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.
done.
a0794a8
to
9ada897
Compare
@gmarek - PTAL |
e2e is not requires as this only touches unit tests, but we need to wait for unit/integration tests to finish before applying the label... |
GCE e2e build/test failed for commit 9ada897. |
GCE e2e test build/test passed for commit 9ada897. |
@k8s-bot test this [submit-queue is verifying that this PR is safe to merge] |
@k8s-bot unit test this please |
GCE e2e test build/test passed for commit 9ada897. |
@k8s-bot unit test this please |
Automatic merge from submit-queue |
Auto commit by PR queue bot
Fix #19141