Move to Go 1.5 #3863
Merged
Move to Go 1.5 #3863
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
|
Fixes #3731 |
otoolep
force-pushed
the
move_to_go1.5
branch
4 times, most recently
from
24cd3c1 to
5529327
Compare
| @@ -517,8 +517,8 @@ func TestClient_Timeout(t *testing.T) { | |||
| _, err = c.Query(query) | |||
| if err == nil { | |||
| t.Fatalf("unexpected success. expected timeout error") | |||
| } else if !strings.Contains(err.Error(), "use of closed network connection") { | |||
| t.Fatalf("unexpected error. expected 'use of closed network connection' error, got %v", err) | |||
| } else if !strings.Contains(err.Error(), "request canceled") { | |||
There was a problem hiding this comment.
@corylanou -- please confirm that this is OK with you. I think the error must have changed in Go 1.5.
There was a problem hiding this comment.
That's interesting. It appears to be a "better" error now. I don't remember reading anything in the release notes on it, but it's probably in their changelog. Seems fine. +1
|
@aviau -- scrap that. Can you please take a look at this build break, and tell me what you think is going on? It seems to think it's overwriting |
|
I think this is #1486560. I could fix it like this: |
|
I opened a PR. #3867 Lets wait for the build. |
From golang/go@516f0d1 "Note that we use a channel send here and not a close. The race detector doesn't know that we're waiting for a timeout and thinks that the waitgroup inside httptest.Server is added to concurrently with us closing it. If we timed out immediately, we could close the testserver before we entered the handler. We're not timing out immediately and there's no way we would be done before we entered the handler, but the race detector doesn't know this, so synchronize explicitly.
| confignotimeout := client.Config{URL: *u} | ||
| cnotimeout, err := client.NewClient(confignotimeout) | ||
| _, err = cnotimeout.Query(query) | ||
| func TestClient_NoTimeout(t *testing.T) { |
There was a problem hiding this comment.
TestClientTimeout has been split into two tests.
|
Green build, ready to make the move to Go 1.5. |
|
+1 |
2 similar comments
|
+1 |
|
+1 |
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.
This patch migrates InfluxDB to Go 1.5.
Very little had to change. The most significant change was to some unit test code, in which an interaction with Go's race detector was exposed. This was addressed using some explicit synchronization. The unit test was also split in two for clarity.
Only one small change to production code was required -- the explicit configuration of GOMAXPROCS.