From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Fri, 29 Jun 2018 14:56:45 +0000 (+0000)
Subject: net/http: remove a flag accidentally submitted in CL 121419
X-Git-Tag: go1.11beta2~251
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d472055a39d3def4989550b5c829a48d53fddc59;p=gostls13.git

net/http: remove a flag accidentally submitted in CL 121419

I thought I removed this but failed to amend it to my commit before
submitting.

Change-Id: I2d687d91f4de72251548faa700006af0fea503af
Reviewed-on: https://go-review.googlesource.com/121615
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
---

diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go
index 5ab17a649e..4e62cee054 100644
--- a/src/net/http/serve_test.go
+++ b/src/net/http/serve_test.go
@@ -14,7 +14,6 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"errors"
-	"flag"
 	"fmt"
 	"internal/testenv"
 	"io"
@@ -5563,11 +5562,9 @@ func testServerShutdown(t *testing.T, h2 bool) {
 	}
 }
 
-var slowTests = flag.Bool("slow", false, "run slow tests")
-
 func TestServerShutdownStateNew(t *testing.T) {
-	if !*slowTests {
-		t.Skip("skipping slow test without -slow flag")
+	if testing.Short() {
+		t.Skip("test takes 5-6 seconds; skipping in short mode")
 	}
 	setParallel(t)
 	defer afterTest(t)