diff options
| author |  Dan Born <dborn+github@google.com> | 2016-02-25 14:23:26 -0800 |
|---|---|---|
| committer | Dan Born <dborn+github@google.com> | 2016-02-25 14:23:26 -0800 |
| commit | 9084418426df2eac1d3881e2b4a320b979606908 (patch) | |
| tree | 9d36514826f2d48598f1adadc65caedbfcd9fa47 /test/cpp | |
| parent | 1b5a264eb80817a6fc362637a7a0497cbc0611ec (diff) | |
| parent | 84a74f89668fbf2b6aebbde7ac0e1675cf7f064c (diff) | |
Merge branch 'master' into custom_test_creds
Diffstat (limited to 'test/cpp')
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index ce8e4d2a10..42757974b2 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -904,9 +904,9 @@ TEST_P(End2endTest, SimultaneousReadWritesDone) { std::thread reader_thread(ReaderThreadFunc, stream.get(), &ev); gpr_event_wait(&ev, gpr_inf_future(GPR_CLOCK_REALTIME)); stream->WritesDone(); + reader_thread.join(); Status s = stream->Finish(); EXPECT_TRUE(s.ok()); - reader_thread.join(); } TEST_P(End2endTest, ChannelState) { |