Fix deploy test conflict flake #5630
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
[test] |
|
lgtm. @smarterclayton or @liggitt for approval. |
|
LGTM |
| new, err := openshift.Client.DeploymentConfigs(testutil.Namespace()).Update(config) | ||
| if err != nil { | ||
| t.Fatalf("Couldn't create updated DeploymentConfig: %v %#v", err, config) | ||
| retryErr := wait.ExponentialBackoff(wait.Backoff{Steps: maxUpdateRetries}, func() (bool, error) { |
There was a problem hiding this comment.
This is exactly the case where you should have used retry.OnConflict
There was a problem hiding this comment.
Switched to use RetryOnConflict
ironcladlou
force-pushed
the
trigger-test-flake-fix
branch
from
135c494
to
f73f6f8
Compare
| if config.LatestVersion != 1 { | ||
| t.Fatalf("Generated deployment should have version 1: %#v", config) | ||
| } | ||
| glog.Infof("config(1): %#v", config) |
There was a problem hiding this comment.
Shouldn't this be log.Printf?
There was a problem hiding this comment.
Yeah, converted those and removed glog dependency
Retry update conflict errors during deploy trigger test.
ironcladlou
force-pushed
the
trigger-test-flake-fix
branch
from
f73f6f8
to
3d05dbc
Compare
|
@smarterclayton cleaned up variables/scopes. |
|
I'd add you to the merge queue... but I don't think it will make a difference. |
|
Evaluated for origin test up to 3d05dbc |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/6826/) |
smarterclayton
added a commit
that referenced
this pull request
Nov 4, 2015
Fix deploy test conflict flake
smarterclayton
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Retry update conflict errors during deploy trigger test.
Fixes #5612