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

Improve source ip preservation test, fail the test instead of panic. #34030

Merged
merged 1 commit into from
Oct 5, 2016

Conversation

MrHohn
Copy link
Member

@MrHohn MrHohn commented Oct 4, 2016

From #31085.

The source IP preserve test starts to be flake again. Sending out this PR to get rid of panicing and log the unexpected output for future investigation.

@freehan

Improve source IP preservation test, fail the test instead of panic.

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Oct 4, 2016
if len(outputs) != 2 {
// fail the test if output format is unexpected
framework.Failf("exec pod returned unexpected stdout format: [%v]\n", stdout)
return execPodIp, ""
Copy link
Member

@ixdy ixdy Oct 4, 2016

Choose a reason for hiding this comment

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

FYI the Failf will abort, so you don't really need this line.

Copy link
Member Author

Choose a reason for hiding this comment

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

Right, thanks for telling!

@ixdy ixdy added release-note-none Denotes a PR that doesn't merit a release note. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed release-note-label-needed labels Oct 4, 2016
@k8s-github-robot
Copy link

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

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 6b82792 into kubernetes:master Oct 5, 2016
@jessfraz jessfraz added cherrypick-candidate cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Oct 24, 2016
@jessfraz jessfraz added this to the v1.4 milestone Oct 24, 2016
@jessfraz jessfraz added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 24, 2016
k8s-github-robot pushed a commit that referenced this pull request Oct 25, 2016
…34107-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of #34030 #34107

Cherry pick of #34030 #34107 on release-1.4.

#34030: examine output format before return, fail the test instead of
#34107: Fix #31085, include output checking in retry loop
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…-of-#34030-kubernetes#34107-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of kubernetes#34030 kubernetes#34107

Cherry pick of kubernetes#34030 kubernetes#34107 on release-1.4.

kubernetes#34030: examine output format before return, fail the test instead of
kubernetes#34107: Fix kubernetes#31085, include output checking in retry loop
@MrHohn MrHohn deleted the e2e_service_fix branch May 16, 2017 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants