diff options
author | Ian Lance Taylor <iant@golang.org> | 2017-02-10 14:59:38 -0800 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2017-02-13 18:36:28 +0000 |
commit | 3792db518327c685da17ca6c6faa4e1d2da4c33c (patch) | |
tree | 8d2456fa679526c8349a968aaf3cae09524aadfd /src/net/dnsclient_unix_test.go | |
parent | b548eee3d96fc0b6e962a243b28121e1f37ad792 (diff) | |
download | go-3792db518327c685da17ca6c6faa4e1d2da4c33c.tar.gz go-3792db518327c685da17ca6c6faa4e1d2da4c33c.zip |
net: refactor poller into new internal/poll package
This will make it possible to use the poller with the os package.
This is a lot of code movement but the behavior is intended to be
unchanged.
Update #6817.
Update #7903.
Update #15021.
Update #18507.
Change-Id: I1413685928017c32df5654ded73a2643820977ae
Reviewed-on: https://go-review.googlesource.com/36799
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/net/dnsclient_unix_test.go')
-rw-r--r-- | src/net/dnsclient_unix_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/dnsclient_unix_test.go b/src/net/dnsclient_unix_test.go index 85267bbddc..4464804c70 100644 --- a/src/net/dnsclient_unix_test.go +++ b/src/net/dnsclient_unix_test.go @@ -9,6 +9,7 @@ package net import ( "context" "fmt" + "internal/poll" "internal/testenv" "io/ioutil" "os" @@ -767,7 +768,7 @@ func TestRetryTimeout(t *testing.T) { if s == "192.0.2.1:53" { deadline0 = deadline time.Sleep(10 * time.Millisecond) - return nil, errTimeout + return nil, poll.ErrTimeout } if deadline == deadline0 { |