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

pkg/k8s: fix heartbeat unit test #10790

Merged
merged 1 commit into from
Apr 1, 2020
Merged

Conversation

aanm
Copy link
Member

@aanm aanm commented Mar 31, 2020

Fix unit test logic for the heartbeat function mock. In some test cases
this function should block until the test is finished so some of those
tests were re-written to take this into account.

Signed-off-by: André Martins andre@cilium.io

Fixes: #10770

3rd time's a charm...

I've ran this test locally 100 times and I didn't hit any failures with the new changes.

Fix unit test logic for the heartbeat function mock. In some test cases
this function should block until the test is finished so some of those
tests were re-written to take this into account.

Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm added pending-review release-note/ci This PR makes changes to the CI. labels Mar 31, 2020
@aanm aanm requested a review from a team March 31, 2020 17:08
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 Mar 31, 2020
@aanm
Copy link
Member Author

aanm commented Mar 31, 2020

test-me-please

@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 45.48% when pulling f4044ce on pr/fix-heartbeat-2nd-attempt into 05f6bbc on master.

@aanm
Copy link
Member Author

aanm commented Mar 31, 2020

restart-ginkgo

@pchaigno
Copy link
Member

pchaigno commented Apr 1, 2020

@aanm
Copy link
Member Author

aanm commented Apr 1, 2020

@aanm
Copy link
Member Author

aanm commented Apr 1, 2020

restart-ginkgo

@joestringer
Copy link
Member

joestringer commented Apr 1, 2020

This is a unit test change which passes Travis and also passes one of the ginkgo runs, so I'm overriding the failed check for flakes on the other ginkgo runs. (I reviewed too, LGTM)

@joestringer joestringer merged commit 26dec4c into master Apr 1, 2020
1.8.0 automation moved this from In progress to Merged Apr 1, 2020
@joestringer joestringer deleted the pr/fix-heartbeat-2nd-attempt branch April 1, 2020 18:43
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.7.2 Apr 1, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.2 Apr 1, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.2 Apr 1, 2020
@joestringer joestringer moved this from Backport pending to v1.7 to Backport done to v1.7 in 1.7.2 Apr 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/ci This PR makes changes to the CI.
Projects
No open projects
1.7.2
Backport done to v1.7
1.8.0
  
Merged
Development

Successfully merging this pull request may close these issues.

CI: Travis: Heartbeat should have closed all connections
4 participants