From 5a6e6e102bf70ec6d2a7bad033abb9d9f008f03c Mon Sep 17 00:00:00 2001
From: Erik Dubbelboer <erik@dubbelboer.com>
Date: Wed, 18 Aug 2021 21:38:21 +0200
Subject: [PATCH] Add Go 1.17 support (#1074)

* Add Go 1.17 support

* Increase test timeouts
---
 .github/workflows/security.yml | 2 +-
 .github/workflows/test.yml     | 2 +-
 reuseport/reuseport_test.go    | 2 +-
 server_test.go                 | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index 7763984b02..13b8fa76af 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -8,7 +8,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 489d98363f..068a6f5cd0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.15.x, 1.16.x]
+        go-version: [1.15.x, 1.16.x, 1.17.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/reuseport/reuseport_test.go b/reuseport/reuseport_test.go
index 7202dcf363..a79b962a77 100644
--- a/reuseport/reuseport_test.go
+++ b/reuseport/reuseport_test.go
@@ -75,7 +75,7 @@ func testNewListener(t *testing.T, network, addr string, serversCount, requestsC
 		}()
 		select {
 		case <-ch:
-		case <-time.After(200 * time.Millisecond):
+		case <-time.After(250 * time.Millisecond):
 			t.Fatalf("%d. timeout when waiting for response", i)
 		}
 
diff --git a/server_test.go b/server_test.go
index b0826f763b..95e80ffefb 100644
--- a/server_test.go
+++ b/server_test.go
@@ -477,7 +477,7 @@ func TestServerErrSmallBuffer(t *testing.T) {
 	var serverErr error
 	select {
 	case serverErr = <-ch:
-	case <-time.After(100 * time.Millisecond):
+	case <-time.After(200 * time.Millisecond):
 		t.Fatal("timeout")
 	}
 
@@ -1929,7 +1929,7 @@ func TestServerContinueHandler(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Unexpected error from serveConn: %s", err)
 			}
-		case <-time.After(200 * time.Millisecond):
+		case <-time.After(250 * time.Millisecond):
 			t.Fatal("timeout")
 		}
 
@@ -3234,7 +3234,7 @@ func TestServerConnError(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Unexpected error from serveConn: %s", err)
 		}
-	case <-time.After(100 * time.Millisecond):
+	case <-time.After(200 * time.Millisecond):
 		t.Fatal("timeout")
 	}