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 master_test flake #19195

Merged
merged 1 commit into from
Dec 30, 2015
Merged

Conversation

wojtek-t
Copy link
Member

Fix #19141

@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 30, 2015
@k8s-bot
Copy link

k8s-bot commented Dec 30, 2015

GCE e2e test build/test passed for commit 33fe6b2dd778a1d9dbefba04e709e682a830e091.

@k8s-bot
Copy link

k8s-bot commented Dec 30, 2015

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)
Copy link
Contributor

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?

Copy link
Member Author

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)

Copy link
Contributor

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?

Copy link
Member Author

Choose a reason for hiding this comment

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

done.

@wojtek-t
Copy link
Member Author

@gmarek - PTAL

@gmarek gmarek added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 30, 2015
@gmarek
Copy link
Contributor

gmarek commented Dec 30, 2015

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...

@wojtek-t
Copy link
Member Author

FAIL k8s.io/kubernetes/pkg/storage/etcd 4.049s - #18928

@k8s-bot unit test this please

@k8s-bot
Copy link

k8s-bot commented Dec 30, 2015

GCE e2e build/test failed for commit 9ada897.

@wojtek-t
Copy link
Member Author

pkg/storage & pkg/registry/generic/etcd failures - #18928

@k8s-bot test this please

@k8s-bot
Copy link

k8s-bot commented Dec 30, 2015

GCE e2e test build/test passed for commit 9ada897.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@wojtek-t
Copy link
Member Author

@k8s-bot unit test this please

@k8s-bot
Copy link

k8s-bot commented Dec 30, 2015

GCE e2e test build/test passed for commit 9ada897.

@wojtek-t
Copy link
Member Author

@k8s-bot unit test this please

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Dec 30, 2015
@k8s-github-robot k8s-github-robot merged commit 7113cfe into kubernetes:master Dec 30, 2015
@gmarek gmarek mentioned this pull request Dec 30, 2015
11 tasks
@wojtek-t wojtek-t deleted the fix_master_test branch February 11, 2016 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants