Fix loading dashboards in ES 5.4 + tests connection timeout increase #4525
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
I started with investigating a flaky test and increasing the connection timeout, but went down the rabbit hole a bit: * The dashboard loader didn't work against 5.4, i think since elastic#4471. This fixes it by checking the version and only setting single_type for > 6.0. * GetTestingElasticsearch now asserts on errors and increases the connection timeout * Several tests were calling Connect twice
andrewkroh
reviewed
Jun 19, 2017
libbeat/outputs/elasticsearch/api.go
Outdated
| @@ -52,7 +53,7 @@ func (r QueryResult) String() string { | |||
|
|
|||
| func withQueryResult(status int, resp []byte, err error) (int, *QueryResult, error) { | |||
| if err != nil { | |||
| return status, nil, err | |||
| return status, nil, errors.Errorf("%v. Response: %s", err, resp) | |||
There was a problem hiding this comment.
This looks like a good candidate for errors.Wrapf as opposed to Errorf.
| var address = "http://" + GetEsHost() + ":" + GetEsPort() | ||
| username := os.Getenv("ES_USER") | ||
| pass := os.Getenv("ES_PASS") | ||
| client := newTestClientAuth(address, username, pass) | ||
|
|
||
| // Load version number | ||
| client.Connect(3 * time.Second) | ||
| err := client.Connect(60 * time.Second) | ||
| assert.NoError(t, err) |
There was a problem hiding this comment.
It would better to use if err != nil { t.Fatal(e) } so that the test doesn't run. assert.NoError is like t.Error in that the test keeps executing.
|
jenkins, test it |
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.
I started with investigating a flaky test and increasing the
connection timeout, but went down the rabbit hole a bit:
fixes it by checking the version and only setting single_type for > 6.0.
timeout