opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust keepalive paramenters in the test such that scheduling delays don't cause false failures too often. (#1730)

Browse Source
This commit is contained in:
mmukhi
2017-12-15 16:03:42 -08:00
committed by GitHub
parent f9390a7b4d
commit 0b24825eb1
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
transport/transport_test.go
View File

@ -689,7 +689,7 @@ func TestKeepaliveServerEnforcementWithAbusiveClientNoRPC(t *testing.T) {
clientOptions := ConnectOptions{ clientOptions := ConnectOptions{
KeepaliveParams: keepalive.ClientParameters{ KeepaliveParams: keepalive.ClientParameters{
Time: 50 * time.Millisecond, Time: 50 * time.Millisecond,
Timeout: 50 * time.Millisecond, Timeout: 1 * time.Second,
PermitWithoutStream: true, PermitWithoutStream: true,
}, },
} }
@ -697,7 +697,7 @@ func TestKeepaliveServerEnforcementWithAbusiveClientNoRPC(t *testing.T) {
defer server.stop() defer server.stop()
defer client.Close() defer client.Close()
timeout := time.NewTimer(2 * time.Second) timeout := time.NewTimer(10 * time.Second)
select { select {
case <-client.GoAway(): case <-client.GoAway():
if !timeout.Stop() { if !timeout.Stop() {
@ -724,7 +724,7 @@ func TestKeepaliveServerEnforcementWithAbusiveClientWithRPC(t *testing.T) {
clientOptions := ConnectOptions{ clientOptions := ConnectOptions{
KeepaliveParams: keepalive.ClientParameters{ KeepaliveParams: keepalive.ClientParameters{
Time: 50 * time.Millisecond, Time: 50 * time.Millisecond,
Timeout: 50 * time.Millisecond, Timeout: 1 * time.Second,
}, },
} }
server, client := setUpWithOptions(t, 0, serverConfig, suspended, clientOptions) server, client := setUpWithOptions(t, 0, serverConfig, suspended, clientOptions)
@ -734,7 +734,7 @@ func TestKeepaliveServerEnforcementWithAbusiveClientWithRPC(t *testing.T) {
if _, err := client.NewStream(context.Background(), &CallHdr{Flush: true}); err != nil { if _, err := client.NewStream(context.Background(), &CallHdr{Flush: true}); err != nil {
t.Fatalf("Client failed to create stream.") t.Fatalf("Client failed to create stream.")
} }
timeout := time.NewTimer(2 * time.Second) timeout := time.NewTimer(10 * time.Second)
select { select {
case <-client.GoAway(): case <-client.GoAway():
if !timeout.Stop() { if !timeout.Stop() {
@ -762,7 +762,7 @@ func TestKeepaliveServerEnforcementWithObeyingClientNoRPC(t *testing.T) {
clientOptions := ConnectOptions{ clientOptions := ConnectOptions{
KeepaliveParams: keepalive.ClientParameters{ KeepaliveParams: keepalive.ClientParameters{
Time: 101 * time.Millisecond, Time: 101 * time.Millisecond,
Timeout: 50 * time.Millisecond, Timeout: 1 * time.Second,
PermitWithoutStream: true, PermitWithoutStream: true,
}, },
} }
@ -771,7 +771,7 @@ func TestKeepaliveServerEnforcementWithObeyingClientNoRPC(t *testing.T) {
defer client.Close() defer client.Close()
// Give keepalive enough time. // Give keepalive enough time.
time.Sleep(2 * time.Second) time.Sleep(3 * time.Second)
// Assert that connection is healthy. // Assert that connection is healthy.
ct := client.(*http2Client) ct := client.(*http2Client)
ct.mu.Lock() ct.mu.Lock()
@ -790,7 +790,7 @@ func TestKeepaliveServerEnforcementWithObeyingClientWithRPC(t *testing.T) {
clientOptions := ConnectOptions{ clientOptions := ConnectOptions{
KeepaliveParams: keepalive.ClientParameters{ KeepaliveParams: keepalive.ClientParameters{
Time: 101 * time.Millisecond, Time: 101 * time.Millisecond,
Timeout: 50 * time.Millisecond, Timeout: 1 * time.Second,
}, },
} }
server, client := setUpWithOptions(t, 0, serverConfig, suspended, clientOptions) server, client := setUpWithOptions(t, 0, serverConfig, suspended, clientOptions)
@ -802,7 +802,7 @@ func TestKeepaliveServerEnforcementWithObeyingClientWithRPC(t *testing.T) {
} }
// Give keepalive enough time. // Give keepalive enough time.
time.Sleep(2 * time.Second) time.Sleep(3 * time.Second)
// Assert that connection is healthy. // Assert that connection is healthy.
ct := client.(*http2Client) ct := client.(*http2Client)
ct.mu.Lock() ct.mu.Lock()
@ -1364,7 +1364,15 @@ func TestServerConnDecoupledFromApplicationRead(t *testing.T) {
} }
func TestServerWithMisbehavedClient(t *testing.T) { func TestServerWithMisbehavedClient(t *testing.T) {
server, ct := setUp(t, 0, math.MaxUint32, suspended) serverConfig := &ServerConfig{
InitialWindowSize: defaultWindowSize,
InitialConnWindowSize: defaultWindowSize,
}
connectOptions := ConnectOptions{
InitialWindowSize: defaultWindowSize,
InitialConnWindowSize: defaultWindowSize,
}
server, ct := setUpWithOptions(t, 0, serverConfig, suspended, connectOptions)
callHdr := &CallHdr{ callHdr := &CallHdr{
Host: "localhost", Host: "localhost",
Method: "foo", Method: "foo",