diff options
author | Sergey Zagursky <gvozdoder@gmail.com> | 2019-11-14 23:07:01 +0300 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2019-11-15 00:03:57 +0000 |
commit | 7719016ee297dd4960bb66ed265038f2d75b3c56 (patch) | |
tree | 7da35441ae214c17a33bf6a6c03696b754ca2725 /src/net/dial_test.go | |
parent | 4de3c7d30b82deb1824d5caf3d1542d6b0cc990b (diff) | |
download | go-7719016ee297dd4960bb66ed265038f2d75b3c56.tar.gz go-7719016ee297dd4960bb66ed265038f2d75b3c56.zip |
net: fix improper Context.Deadline usage in DialContext
The existing implementation is erroneously assume that having no
deadline in context.Context means that time returned from Deadline
method will have IsZero() == true. But technically speaking this is an
invalid assumption. The context.Context interface specification doesn't
specify what time should be returned from Deadline method when there is
no deadline set. It only specifies that second result of Deadline should
be false.
Fixes #35594
Change-Id: Ife00aad77ab3585e469f15017550ac6c0431b140
Reviewed-on: https://go-review.googlesource.com/c/go/+/207297
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/net/dial_test.go')
-rw-r--r-- | src/net/dial_test.go | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/net/dial_test.go b/src/net/dial_test.go index 2eddac8284..4312a6df71 100644 --- a/src/net/dial_test.go +++ b/src/net/dial_test.go @@ -980,3 +980,32 @@ func mustHaveExternalNetwork(t *testing.T) { testenv.MustHaveExternalNetwork(t) } } + +type contextWithNonZeroDeadline struct { + context.Context +} + +func (contextWithNonZeroDeadline) Deadline() (time.Time, bool) { + // Return non-zero time.Time value with false indicating that no deadline is set. + return time.Unix(0, 0), false +} + +func TestDialWithNonZeroDeadline(t *testing.T) { + ln, err := newLocalListener("tcp") + if err != nil { + t.Fatal(err) + } + defer ln.Close() + _, port, err := SplitHostPort(ln.Addr().String()) + if err != nil { + t.Fatal(err) + } + + ctx := contextWithNonZeroDeadline{Context: context.Background()} + var dialer Dialer + c, err := dialer.DialContext(ctx, "tcp", JoinHostPort("", port)) + if err != nil { + t.Fatal(err) + } + c.Close() +} |