summaryrefslogtreecommitdiff
path: root/libgo
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-27 21:42:26 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-27 21:42:26 +0000
commit6d196b4d5a0ecffc3b93543ef404fcabad280752 (patch)
treebb4889ca199becb32f662feed26f5fa02c506219 /libgo
parentaffa436aec0c9a328d2791413b943a46a4eed123 (diff)
downloadgcc-6d196b4d5a0ecffc3b93543ef404fcabad280752.tar.gz
PR go/59506
net: use DialTimeout in TestSelfConnect Backported from master repository. This avoids problems with systems that take a long time to find out nothing is listening, while still testing for the self-connect misfeature since a self-connect should be fast. With this we may be able to remove the test for non-Linux systems. Tested (on GNU/Linux) by editing selfConnect in tcpsock_posix.go to always return false and verifying that TestSelfConnect then fails with and without this change. Idea from Uros Bizjak. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206224 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
-rw-r--r--libgo/go/net/dial_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libgo/go/net/dial_test.go b/libgo/go/net/dial_test.go
index c7ffdd3d9c8..973e69dea5d 100644
--- a/libgo/go/net/dial_test.go
+++ b/libgo/go/net/dial_test.go
@@ -147,7 +147,7 @@ func TestSelfConnect(t *testing.T) {
n = 100
}
for i := 0; i < n; i++ {
- c, err := Dial("tcp", addr)
+ c, err := DialTimeout("tcp", addr, time.Millisecond)
if err == nil {
c.Close()
t.Errorf("#%d: Dial %q succeeded", i, addr)