Remove hack for not running tests in parallel in Travis

lyft · Sep 16, 2021 · 93e805e · 93e805e
1 parent eca9aab
commit 93e805e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 25 deletions.
diff --git a/net_sink_test.go b/net_sink_test.go
@@ -642,7 +642,7 @@ func testNetSinkReconnect(t *testing.T, protocol string) {
 	if testing.Short() {
 		t.Skip("Skipping: short test")
 	}
-	Parallel(t)
+	t.Parallel()
 
 	const expected = "counter:1|c\n"
 
@@ -692,7 +692,7 @@ func testNetSinkReconnectFailure(t *testing.T, protocol string) {
 	if testing.Short() {
 		t.Skip("Skipping: short test")
 	}
-	Parallel(t)
+	t.Parallel()
 
 	ts, sink := setupTestNetSink(t, protocol, true)
 	defer ts.Close()
@@ -794,7 +794,7 @@ func buildBinary(t testing.TB, path string) (string, func()) {
 }
 
 func testNetSinkIntegration(t *testing.T, protocol string) {
-	Parallel(t)
+	t.Parallel()
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

diff --git a/net_util_test.go b/net_util_test.go
@@ -359,7 +359,7 @@ func reconnectRetry(t testing.TB, fn func() error) {
 }
 
 func TestReconnectRetryTCP(t *testing.T) {
-	Parallel(t)
+	t.Parallel()
 
 	l1, err := net.ListenTCP("tcp", &net.TCPAddr{
 		IP:   net.IPv4(127, 0, 0, 1),
@@ -397,7 +397,7 @@ func TestReconnectRetryTCP(t *testing.T) {
 }
 
 func TestReconnectRetryUDP(t *testing.T) {
-	Parallel(t)
+	t.Parallel()
 
 	l1, err := net.ListenUDP("udp", &net.UDPAddr{
 		IP:   net.IPv4(127, 0, 0, 1),

diff --git a/parallel_ci_test.go b/parallel_ci_test.go
diff --git a/parallel_test.go b/parallel_test.go
diff --git a/stat_handler_test.go b/stat_handler_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func TestHttpHandler_ServeHTTP(t *testing.T) {
-	Parallel(t)
+	t.Parallel()
 
 	sink := mock.NewSink()
 	store := NewStore(sink, false)

diff --git a/stat_handler_wrapper_1.7_test.go b/stat_handler_wrapper_1.7_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestHTTPHandler_WrapResponse(t *testing.T) {
-	Parallel(t)
+	t.Parallel()
 
 	tests := []http.ResponseWriter{
 		struct {
@@ -58,7 +58,7 @@ func TestHTTPHandler_WrapResponse(t *testing.T) {
 	for i, test := range tests {
 		tc := test
 		t.Run(fmt.Sprint("test:", i), func(t *testing.T) {
-			Parallel(t)
+			t.Parallel()
 
 			_, canFlush := tc.(http.Flusher)
 			_, canHijack := tc.(http.Hijacker)