code review changes

snowflakedb · Dec 9, 2024 · 31f6ec2 · 31f6ec2
1 parent 3b0acad
commit 31f6ec2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/ci/container/test_authentication.sh b/ci/container/test_authentication.sh
@@ -12,7 +12,7 @@ eval $(jq -r '.authtestparams | to_entries | map("export \(.key)=\(.value|tostri
 $MVNW_EXE -DjenkinsIT \
     -Djava.io.tmpdir=$WORKSPACE \
     -Djacoco.skip.instrument=true \
-    -Dskip.ut=true \
+    -Dskip.unitTests=true \
     -DintegrationTestSuites=AuthenticationTestSuite \
     -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
     -Dnot-self-contained-jar \

diff --git a/parent-pom.xml b/parent-pom.xml
@@ -78,7 +78,7 @@
     <relocationBase>net/snowflake/client/jdbc/internal</relocationBase>
     <shadeBase>net.snowflake.client.jdbc.internal</shadeBase>
     <shadeNativeBase>net_snowflake_client_jdbc_internal</shadeNativeBase>
-    <skip.ut>false</skip.ut>
+    <skip.unitTests>false</skip.unitTests>
     <slf4j.version>2.0.13</slf4j.version>
     <snowflake.common.version>5.1.4</snowflake.common.version>
     <integrationTestSuites>UnitTestSuite</integrationTestSuites>

diff --git a/pom.xml b/pom.xml
@@ -1162,7 +1162,7 @@
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <skipTests>${skip.ut}</skipTests>
+              <skipTests>${skip.unitTests}</skipTests>
               <argLine>--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</argLine>
             </configuration>
           </plugin>
@@ -1215,7 +1215,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <test>UnitTestSuite</test>
-              <skipTests>${skip.ut}</skipTests>
+              <skipTests>${skip.unitTests}</skipTests>
             </configuration>
             <dependencies>
               <dependency>

diff --git a/src/test/java/net/snowflake/client/authentication/AuthTest.java b/src/test/java/net/snowflake/client/authentication/AuthTest.java
@@ -13,6 +13,8 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
 import net.snowflake.client.core.SessionUtil;
 import net.snowflake.client.jdbc.SnowflakeConnectionV1;
 import net.snowflake.client.jdbc.SnowflakeSQLException;
@@ -62,7 +64,7 @@ public void provideCredentials(String scenario, String login, String password) {
       ProcessBuilder processBuilder =
           new ProcessBuilder("node", provideBrowserCredentialsPath, scenario, login, password);
       Process process = processBuilder.start();
-      process.waitFor();
+      process.waitFor(15, TimeUnit.SECONDS);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -74,7 +76,7 @@ public void cleanBrowserProcesses() {
       ProcessBuilder processBuilder = new ProcessBuilder("node", cleanBrowserProcessesPath);
       try {
         Process process = processBuilder.start();
-        process.waitFor();
+        process.waitFor(15, TimeUnit.SECONDS);
       } catch (InterruptedException | IOException e) {
         throw new RuntimeException(e);
       }