Skip to content

Commit e26ab92

Browse files
zeroshaderaulcd
authored andcommitted
GH-35089: [CI][C++][Flight] Test failures in macos release verification nightlies (#35090)
* Closes: #35089 Authored-by: Matt Topol <zotthewizard@gmail.com> Signed-off-by: Matthew Topol <zotthewizard@gmail.com>
1 parent ffa2ac5 commit e26ab92

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

ci/conda_env_cpp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ gflags
2727
glog
2828
gmock>=1.10.0
2929
google-cloud-cpp>=1.34.0
30-
grpc-cpp
30+
grpc-cpp<=1.50.1
3131
gtest>=1.10.0
3232
libprotobuf
3333
libutf8proc

cpp/src/arrow/flight/flight_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ TEST_F(TestFlightClient, TimeoutFires) {
10231023
Status status = client->GetFlightInfo(options, FlightDescriptor{}).status();
10241024
auto end = std::chrono::system_clock::now();
10251025
#ifdef ARROW_WITH_TIMING_TESTS
1026-
EXPECT_LE(end - start, std::chrono::milliseconds{400});
1026+
EXPECT_LE(end - start, std::chrono::milliseconds{1200});
10271027
#else
10281028
ARROW_UNUSED(end - start);
10291029
#endif

cpp/src/arrow/flight/test_definitions.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,11 @@ void ConnectivityTest::TestBrokenConnection() {
108108
ASSERT_OK(server->Shutdown());
109109
ASSERT_OK(server->Wait());
110110

111-
ASSERT_RAISES(IOError, client->GetFlightInfo(FlightDescriptor::Command("")));
111+
auto status = client->GetFlightInfo(FlightDescriptor::Command(""));
112+
ASSERT_NOT_OK(status);
113+
ASSERT_THAT(
114+
status.status().code(),
115+
::testing::AnyOf(::arrow::StatusCode::IOError, ::arrow::StatusCode::UnknownError));
112116
}
113117

114118
//------------------------------------------------------------

0 commit comments

Comments
 (0)