From aedf1ebf04c82137a13d4505b71f663de928e976 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 17 Nov 2026 14:45:57 +0100 Subject: [PATCH 1/2] GH-55630: [CI][C++] Relax simdjson error message checking The kind of error messages returned has changed slightly in some of our tests with simdjson 5.2.0, so relax these tests. --- cpp/src/arrow/json/reader_test.cc | 7 ++++--- python/pyarrow/tests/test_json.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cpp/src/arrow/json/reader_test.cc b/cpp/src/arrow/json/reader_test.cc index bc533595614a..8d37210bd7e3 100644 --- a/cpp/src/arrow/json/reader_test.cc +++ b/cpp/src/arrow/json/reader_test.cc @@ -741,9 +741,10 @@ TEST_P(StreamingReaderTest, PropagateErrorsNonLinewiseChunker) { read_options_.block_size = 10; parse_options_.newlines_in_values = true; - EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, - ::testing::StartsWith("Invalid: JSON parse error"), - MakeReader(bad_first_block)); + EXPECT_RAISES_WITH_MESSAGE_THAT( + Invalid, + ::testing::ContainsRegex("Invalid: (JSON parse error|Failed to get JSON object)"), + MakeReader(bad_first_block)); ASSERT_OK_AND_ASSIGN(reader, MakeReader(bad_middle_blocks)); AssertReadNext(reader, &batch); diff --git a/python/pyarrow/tests/test_json.py b/python/pyarrow/tests/test_json.py index 2239c2f1bb8b..3dc54d53fba9 100644 --- a/python/pyarrow/tests/test_json.py +++ b/python/pyarrow/tests/test_json.py @@ -525,7 +525,7 @@ def test_non_linewise_chunker_first_block(self): 'n': [0] } with pytest.raises(pa.ArrowInvalid, - match="JSON parse error *"): + match="(JSON parse error|Failed to get JSON object)"): reader.read_next_batch() with pytest.raises(StopIteration): @@ -546,7 +546,7 @@ def test_non_linewise_chunker_bad_first_block(self): 'n': [0] } with pytest.raises(pa.ArrowInvalid, - match="JSON parse error *"): + match="(JSON parse error|Failed to get JSON object)"): reader.read_next_batch() with pytest.raises(StopIteration): From 500fe4a630fd882b37bda1949b513eeeed52b48f Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 17 Nov 2026 15:22:33 +0100 Subject: [PATCH 2/2] Fix test for Windows --- cpp/src/arrow/json/reader_test.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cpp/src/arrow/json/reader_test.cc b/cpp/src/arrow/json/reader_test.cc index 8d37210bd7e3..9d056388a019 100644 --- a/cpp/src/arrow/json/reader_test.cc +++ b/cpp/src/arrow/json/reader_test.cc @@ -741,9 +741,12 @@ TEST_P(StreamingReaderTest, PropagateErrorsNonLinewiseChunker) { read_options_.block_size = 10; parse_options_.newlines_in_values = true; + // (can't use ::testing::MatchesRegex because of + // https://github.com/google/googletest/issues/3084) EXPECT_RAISES_WITH_MESSAGE_THAT( Invalid, - ::testing::ContainsRegex("Invalid: (JSON parse error|Failed to get JSON object)"), + ::testing::AnyOf(::testing::StartsWith("Invalid: JSON parse error"), + ::testing::StartsWith("Invalid: Failed to get JSON object")), MakeReader(bad_first_block)); ASSERT_OK_AND_ASSIGN(reader, MakeReader(bad_middle_blocks));