(ignite-3) branch main updated: IGNITE-21879 Sql. Jdbc IdbcStatementSelfTest.testOpenCursorsPureQuery is flaky (#3543)

[zstan]

This is an automated email from the ASF dual-hosted git repository.

zstan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new d28153dce8 IGNITE-21879 Sql. Jdbc 
IdbcStatementSelfTest.testOpenCursorsPureQuery is flaky (#3543)
d28153dce8 is described below

commit d28153dce85e25f8294d0e049e9754b3f894be3d
Author: Evgeniy Stanilovskiy <stanilov...@gmail.com>
AuthorDate: Wed Apr 3 14:05:59 2024 +0300

    IGNITE-21879 Sql. Jdbc IdbcStatementSelfTest.testOpenCursorsPureQuery is 
flaky (#3543)
---
 .../java/org/apache/ignite/jdbc/ItJdbcErrorsSelfTest.java      |  2 --
 .../java/org/apache/ignite/jdbc/ItJdbcStatementSelfTest.java   | 10 +++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git 
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcErrorsSelfTest.java
 
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcErrorsSelfTest.java
index 6a19c5d517..4ba59b5c74 100644
--- 
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcErrorsSelfTest.java
+++ 
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcErrorsSelfTest.java
@@ -59,8 +59,6 @@ public class ItJdbcErrorsSelfTest extends 
ItJdbcErrorsAbstractSelfTest {
      */
     @Test
     public void processMixedQueries() throws SQLException {
-        conn = 
DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1:10800/");
-
         try (Statement stmt = conn.createStatement()) {
             stmt.executeUpdate(
                     "CREATE TABLE CITIES ("
diff --git 
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcStatementSelfTest.java
 
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcStatementSelfTest.java
index 9e509409ab..dd14ac823c 100644
--- 
a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcStatementSelfTest.java
+++ 
b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcStatementSelfTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.jdbc;
 
+import static 
org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
 import static 
org.apache.ignite.jdbc.util.JdbcTestUtils.assertThrowsSqlException;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -807,8 +808,6 @@ public class ItJdbcStatementSelfTest extends 
ItJdbcAbstractStatementSelfTest {
 
     @Test
     public void testOpenCursorsPureQuery() throws Exception {
-        int initial = openResources();
-
         stmt.execute("SELECT 1; SELECT 2;");
         ResultSet rs = stmt.getResultSet();
         stmt.execute("SELECT 3;");
@@ -821,20 +820,17 @@ public class ItJdbcStatementSelfTest extends 
ItJdbcAbstractStatementSelfTest {
         }
 
         stmt.close();
-        assertEquals(0, openResources() - initial);
-        assertEquals(0, openCursors());
+        assertTrue(waitForCondition(() -> openCursors() == 0, 5_000));
     }
 
     @Test
     public void testOpenCursorsWithDdl() throws Exception {
-        int initial = openResources();
-
         stmt.execute("CREATE TABLE T1(ID INT PRIMARY KEY, AGE INT, NAME 
VARCHAR)");
         stmt.getResultSet();
         stmt.execute("SELECT 3;");
         stmt.execute("DROP TABLE T1");
         stmt.getResultSet();
 
-        assertEquals(0, openResources() - initial);
+        assertTrue(waitForCondition(() -> openCursors() == 0, 5_000));
     }
 }