This is an automated email from the ASF dual-hosted git repository. raulcd pushed a commit to branch maint-12.0.0 in repository https://gitbox.apache.org/repos/asf/arrow.git
commit e26ab92a467e07fc8710288dc09ae1a3a9aa060b Author: Matt Topol <[email protected]> AuthorDate: Sun Apr 16 13:36:48 2023 -0400 GH-35089: [CI][C++][Flight] Test failures in macos release verification nightlies (#35090) * Closes: #35089 Authored-by: Matt Topol <[email protected]> Signed-off-by: Matthew Topol <[email protected]> --- ci/conda_env_cpp.txt | 2 +- cpp/src/arrow/flight/flight_test.cc | 2 +- cpp/src/arrow/flight/test_definitions.cc | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ci/conda_env_cpp.txt b/ci/conda_env_cpp.txt index 4ca76a7215..902c952532 100644 --- a/ci/conda_env_cpp.txt +++ b/ci/conda_env_cpp.txt @@ -27,7 +27,7 @@ gflags glog gmock>=1.10.0 google-cloud-cpp>=1.34.0 -grpc-cpp +grpc-cpp<=1.50.1 gtest>=1.10.0 libprotobuf libutf8proc diff --git a/cpp/src/arrow/flight/flight_test.cc b/cpp/src/arrow/flight/flight_test.cc index 502a789840..5520dfc48f 100644 --- a/cpp/src/arrow/flight/flight_test.cc +++ b/cpp/src/arrow/flight/flight_test.cc @@ -1023,7 +1023,7 @@ TEST_F(TestFlightClient, TimeoutFires) { Status status = client->GetFlightInfo(options, FlightDescriptor{}).status(); auto end = std::chrono::system_clock::now(); #ifdef ARROW_WITH_TIMING_TESTS - EXPECT_LE(end - start, std::chrono::milliseconds{400}); + EXPECT_LE(end - start, std::chrono::milliseconds{1200}); #else ARROW_UNUSED(end - start); #endif diff --git a/cpp/src/arrow/flight/test_definitions.cc b/cpp/src/arrow/flight/test_definitions.cc index 9d08c70df1..507c5ef404 100644 --- a/cpp/src/arrow/flight/test_definitions.cc +++ b/cpp/src/arrow/flight/test_definitions.cc @@ -108,7 +108,11 @@ void ConnectivityTest::TestBrokenConnection() { ASSERT_OK(server->Shutdown()); ASSERT_OK(server->Wait()); - ASSERT_RAISES(IOError, client->GetFlightInfo(FlightDescriptor::Command(""))); + auto status = client->GetFlightInfo(FlightDescriptor::Command("")); + ASSERT_NOT_OK(status); + ASSERT_THAT( + status.status().code(), + ::testing::AnyOf(::arrow::StatusCode::IOError, ::arrow::StatusCode::UnknownError)); } //------------------------------------------------------------
