Merge branch 'fix'

nhooyr · nhooyr · commit c733166323a6 · 2020-02-16T21:08:11.000-05:00
diff --git a/conn_test.go b/conn_test.go
@@ -329,7 +329,7 @@ func newConnTest(t testing.TB, dialOpts *websocket.DialOptions, acceptOpts *webs
 	}
 	t.Helper()
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	tt = &connTest{t: t, ctx: ctx}
 	tt.appendDone(cancel)
 

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ func newConnTest(t testing.TB, dialOpts websocket.DialOptions, acceptOpts webs`
`329`	`329`	`}`
`330`	`330`	`t.Helper()`
`331`	`331`
`332`		`- ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)`
	`332`	`+ ctx, cancel := context.WithTimeout(context.Background(), time.Minute)`
`333`	`333`	`tt = &connTest{t: t, ctx: ctx}`
`334`	`334`	`tt.appendDone(cancel)`
`335`	`335`