Fix TestFlightSqlServer#TestCommandGetSqlInfoNoInfo failure on CI

apache · Dec 20, 2021 · 5866b91 · 5866b91
1 parent 7588f66
commit 5866b91
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
@@ -736,7 +736,9 @@ if(ARROW_FLIGHT_SQL)
   add_subdirectory(flight/sql)
 endif()
 
-if(ARROW_FLIGHT AND ARROW_FLIGHT_SQL AND ARROW_BUILD_INTEGRATION)
+if(ARROW_FLIGHT
+   AND ARROW_FLIGHT_SQL
+   AND ARROW_BUILD_INTEGRATION)
   add_subdirectory(flight/integration_tests)
 endif()
 

diff --git a/cpp/src/arrow/flight/sql/server_test.cc b/cpp/src/arrow/flight/sql/server_test.cc
@@ -758,7 +758,7 @@ TEST_F(TestFlightSqlServer, TestCommandGetSqlInfoNoInfo) {
   ASSERT_OK_AND_ASSIGN(auto flight_info, sql_client->GetSqlInfo(call_options, {999999}));
 
   EXPECT_RAISES_WITH_MESSAGE_THAT(
-      KeyError, ::testing::HasSubstr("No information for SQL info number 999999."),
+      KeyError, ::testing::HasSubstr("No information for SQL info number 999999"),
       sql_client->DoGet(call_options, flight_info->endpoints()[0].ticket));
 }
 

diff --git a/dev/archery/archery/integration/runner.py b/dev/archery/archery/integration/runner.py
@@ -384,7 +384,7 @@ def run_all_tests(with_cpp=True, with_java=True, with_js=True,
         ),
         Scenario(
             "flight_sql",
-            description="Ensure that Flight SQL protocol is working as expected.",
+            description="Ensure Flight SQL protocol is working as expected.",
             skip={"Rust", "Go"}
         ),
     ]

diff --git a/dev/archery/archery/integration/tester_java.py b/dev/archery/archery/integration/tester_java.py
@@ -49,8 +49,9 @@ class JavaTester(Tester):
     ARROW_FLIGHT_JAR = os.environ.get(
         'ARROW_FLIGHT_JAVA_INTEGRATION_JAR',
         os.path.join(ARROW_ROOT_DEFAULT,
-                     'java/flight/flight-integration-tests/target/flight-integration-tests-{}-'
-                     'jar-with-dependencies.jar'.format(_arrow_version)))
+                     'java/flight/flight-integration-tests/target/'
+                     'flight-integration-tests-{}-jar-with-dependencies.jar'
+                     .format(_arrow_version)))
     ARROW_FLIGHT_SERVER = ('org.apache.arrow.flight.integration.tests.'
                            'IntegrationTestServer')
     ARROW_FLIGHT_CLIENT = ('org.apache.arrow.flight.integration.tests.'