From 9fc076dd02248df8a1a5553b7184c95ae13ae5b5 Mon Sep 17 00:00:00 2001
From: iamqizhao <toqizhao@gmail.com>
Date: Fri, 24 Jul 2015 14:31:04 -0700
Subject: [PATCH] fix a flaky end2end test due to PR#248
---
test/end2end_test.go | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/test/end2end_test.go b/test/end2end_test.go
index 8d7eac83..82ca4199 100644
--- a/test/end2end_test.go
+++ b/test/end2end_test.go
@@ -894,23 +894,32 @@ func testExceedMaxStreamsLimit(t *testing.T, e env) {
s, cc := setUp(nil, 1, "", e)
tc := testpb.NewTestServiceClient(cc)
defer tearDown(s, cc)
- // Perform a unary RPC to make sure the new settings were propagated to the client.
- if _, err := tc.EmptyCall(context.Background(), &testpb.Empty{}); err != nil {
- t.Fatalf("%v.EmptyCall(_, _) = _, %v, want _, <nil>", tc, err)
- }
- // Initiate the 1st stream
- if _, err := tc.StreamingInputCall(context.Background()); err != nil {
- t.Fatalf("%v.StreamingInputCall(_) = %v, want <nil>", tc, err)
- }
- var wg sync.WaitGroup
- wg.Add(1)
+ done := make(chan struct{})
+ ch := make(chan int)
go func() {
- defer wg.Done()
- // The 2nd stream should block until its deadline exceeds.
- ctx, _ := context.WithTimeout(context.Background(), time.Second)
- if _, err := tc.StreamingInputCall(ctx); grpc.Code(err) != codes.DeadlineExceeded {
- t.Errorf("%v.StreamingInputCall(%v) = _, %v, want error code %d", tc, ctx, err, codes.DeadlineExceeded)
+ for {
+ select {
+ case <-time.After(5 * time.Millisecond):
+ ch <- 0
+ case <-time.After(5 * time.Second):
+ close(done)
+ return
+ }
}
}()
- wg.Wait()
+ // Loop until a stream creation hangs due to the new max stream setting.
+ for {
+ select {
+ case <-ch:
+ ctx, _ := context.WithTimeout(context.Background(), time.Second)
+ if _, err := tc.StreamingInputCall(ctx); err != nil {
+ if grpc.Code(err) == codes.DeadlineExceeded {
+ return
+ }
+ t.Fatalf("%v.StreamingInputCall(_) = %v, want <nil>", tc, err)
+ }
+ case <-done:
+ t.Fatalf("Client has not received the max stream setting in 5 seconds.")
+ }
+ }
}