Merge remote-tracking branch 'upstream/master' into spiffe1

pull/19778/head
Matthew Stevenson 6 years ago
commit de3a6465b4
  1. 27
      test/cpp/end2end/cfstream_test.cc
  2. 2
      tools/internal_ci/macos/grpc_basictests_node.cfg
  3. 2
      tools/internal_ci/macos/pull_request/grpc_basictests_node.cfg

@ -195,7 +195,22 @@ class CFStreamTest : public ::testing::TestWithParam<TestScenario> {
void ShutdownCQ() { cq_.Shutdown(); } void ShutdownCQ() { cq_.Shutdown(); }
bool CQNext(void** tag, bool* ok) { return cq_.Next(tag, ok); } bool CQNext(void** tag, bool* ok) {
auto deadline = std::chrono::system_clock::now() + std::chrono::seconds(10);
auto ret = cq_.AsyncNext(tag, ok, deadline);
if (ret == grpc::CompletionQueue::GOT_EVENT) {
return true;
} else if (ret == grpc::CompletionQueue::SHUTDOWN) {
return false;
} else {
GPR_ASSERT(ret == grpc::CompletionQueue::TIMEOUT);
// This can happen if we hit the Apple CFStream bug which results in the
// read stream hanging. We are ignoring hangs and timeouts, but these
// tests are still useful as they can catch memory memory corruptions,
// crashes and other bugs that don't result in test hang/timeout.
return false;
}
}
bool WaitForChannelNotReady(Channel* channel, int timeout_seconds = 5) { bool WaitForChannelNotReady(Channel* channel, int timeout_seconds = 5) {
const gpr_timespec deadline = const gpr_timespec deadline =
@ -391,7 +406,10 @@ TEST_P(CFStreamTest, NetworkFlapRpcsInFlight) {
} }
delete call; delete call;
} }
EXPECT_EQ(total_completions, rpcs_sent); // Remove line below and uncomment the following line after Apple CFStream
// bug has been fixed.
(void)rpcs_sent;
// EXPECT_EQ(total_completions, rpcs_sent);
}); });
for (int i = 0; i < 100; ++i) { for (int i = 0; i < 100; ++i) {
@ -432,7 +450,10 @@ TEST_P(CFStreamTest, ConcurrentRpc) {
} }
delete call; delete call;
} }
EXPECT_EQ(total_completions, rpcs_sent); // Remove line below and uncomment the following line after Apple CFStream
// bug has been fixed.
(void)rpcs_sent;
// EXPECT_EQ(total_completions, rpcs_sent);
}); });
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {

@ -17,7 +17,7 @@
# Location of the continuous shell script in repository. # Location of the continuous shell script in repository.
build_file: "grpc/tools/internal_ci/macos/grpc_run_tests_matrix.sh" build_file: "grpc/tools/internal_ci/macos/grpc_run_tests_matrix.sh"
gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
timeout_mins: 60 timeout_mins: 120
action { action {
define_artifacts { define_artifacts {
regex: "**/*sponge_log.*" regex: "**/*sponge_log.*"

@ -17,7 +17,7 @@
# Location of the continuous shell script in repository. # Location of the continuous shell script in repository.
build_file: "grpc/tools/internal_ci/macos/grpc_run_tests_matrix.sh" build_file: "grpc/tools/internal_ci/macos/grpc_run_tests_matrix.sh"
gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json" gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
timeout_mins: 60 timeout_mins: 120
action { action {
define_artifacts { define_artifacts {
regex: "**/*sponge_log.*" regex: "**/*sponge_log.*"

Loading…
Cancel
Save