diff --git a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteConnectorTest.java b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteConnectorTest.java index f932948ccc2f..8e834d8c2beb 100644 --- a/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteConnectorTest.java +++ b/plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestIgniteConnectorTest.java @@ -22,8 +22,6 @@ import io.trino.testing.TestingConnectorBehavior; import io.trino.testing.sql.SqlExecutor; import io.trino.testing.sql.TestTable; -import io.trino.testng.services.Flaky; -import org.intellij.lang.annotations.Language; import org.junit.jupiter.api.Test; import java.util.List; @@ -42,10 +40,6 @@ public class TestIgniteConnectorTest extends BaseJdbcConnectorTest { - private static final String SCHEMA_CHANGE_OPERATION_FAIL_ISSUE = "https://github.com/trinodb/trino/issues/14391"; - @Language("RegExp") - private static final String SCHEMA_CHANGE_OPERATION_FAIL_MATCH = "Schema change operation failed: Thread got interrupted while trying to acquire table lock."; - private TestingIgniteServer igniteServer; @Override @@ -338,7 +332,6 @@ protected void verifyConcurrentAddColumnFailurePermissible(Exception e) @Test @Override - @Flaky(issue = SCHEMA_CHANGE_OPERATION_FAIL_ISSUE, match = SCHEMA_CHANGE_OPERATION_FAIL_MATCH) public void testDropAndAddColumnWithSameName() { // Override because Ignite can access old data after dropping and adding a column with same name @@ -351,38 +344,6 @@ public void testDropAndAddColumnWithSameName() } } - @Test - @Override - @Flaky(issue = SCHEMA_CHANGE_OPERATION_FAIL_ISSUE, match = SCHEMA_CHANGE_OPERATION_FAIL_MATCH) - public void testAddColumn() - { - super.testAddColumn(); - } - - @Test - @Override - @Flaky(issue = SCHEMA_CHANGE_OPERATION_FAIL_ISSUE, match = SCHEMA_CHANGE_OPERATION_FAIL_MATCH) - public void testDropColumn() - { - super.testDropColumn(); - } - - @Test - @Override - @Flaky(issue = SCHEMA_CHANGE_OPERATION_FAIL_ISSUE, match = SCHEMA_CHANGE_OPERATION_FAIL_MATCH) - public void testAlterTableAddLongColumnName() - { - super.testAlterTableAddLongColumnName(); - } - - @Test - @Override - @Flaky(issue = SCHEMA_CHANGE_OPERATION_FAIL_ISSUE, match = SCHEMA_CHANGE_OPERATION_FAIL_MATCH) - public void testAddAndDropColumnName() - { - super.testAddAndDropColumnName(); - } - @Override protected TestTable simpleTable() { diff --git a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java index ed70900f8e81..3241d3b3ec8f 100644 --- a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java +++ b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java @@ -29,7 +29,6 @@ import io.trino.testing.QueryRunner; import io.trino.testing.TestingConnectorBehavior; import io.trino.testing.sql.TestTable; -import io.trino.testng.services.Flaky; import io.trino.tpch.TpchTable; import org.intellij.lang.annotations.Language; import org.junit.jupiter.api.Test; @@ -134,8 +133,6 @@ public void testSelect() } @Test - // TODO (https://github.com/trinodb/trino/issues/8691) fix the test - @Flaky(issue = "https://github.com/trinodb/trino/issues/8691", match = "ComparisonFailure: expected: but was:<(LongCount\\{total=\\[\\d+]}|null)>") public void testCustomMetricsScanFilter() { Metrics metrics = collectCustomMetrics("SELECT partkey FROM part WHERE partkey % 1000 > 0"); @@ -145,7 +142,6 @@ public void testCustomMetricsScanFilter() } @Test - @Flaky(issue = "https://github.com/trinodb/trino/issues/8691", match = "ComparisonFailure: expected: but was:<(LongCount\\{total=\\[\\d+]}|null)>") public void testCustomMetricsScanOnly() { Metrics metrics = collectCustomMetrics("SELECT partkey FROM part"); diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java index be0109175c48..93a487e70201 100644 --- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java +++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java @@ -24,7 +24,6 @@ import io.trino.sql.planner.plan.FilterNode; import io.trino.testing.TestingConnectorBehavior; import io.trino.testing.sql.TestTable; -import io.trino.testng.services.Flaky; import org.junit.jupiter.api.Test; import java.util.List; @@ -124,15 +123,6 @@ public void testReadFromView() onRemoteDatabase().execute("DROP VIEW IF EXISTS test_view"); } - // TODO (https://github.com/trinodb/trino/issues/10846): Test is expected to be flaky because tests execute in parallel - @Flaky(issue = "https://github.com/trinodb/trino/issues/10846", match = "was deadlocked on lock resources with another process and has been chosen as the deadlock victim") - @Test - @Override - public void testSelectInformationSchemaColumns() - { - super.testSelectInformationSchemaColumns(); - } - @Override protected void verifyAddNotNullColumnToNonEmptyTableFailurePermissible(Throwable e) { diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerConnectorTest.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerConnectorTest.java index f859fed7a306..ea24c422795e 100644 --- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerConnectorTest.java +++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerConnectorTest.java @@ -19,7 +19,6 @@ import io.trino.testing.QueryRunner; import io.trino.testing.sql.SqlExecutor; import io.trino.testing.sql.TestTable; -import io.trino.testng.services.Flaky; import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Jdbi; import org.junit.jupiter.api.Test; @@ -91,7 +90,6 @@ private void testCreateTableAsSelectWriteBulkiness(boolean bulkCopyForWrite, boo assertUpdate("DROP TABLE " + table); } - @Flaky(issue = "fn_dblog() returns information only about the active portion of the transaction log, therefore it is flaky", match = ".*") @Test public void testInsertWriteBulkiness() throws SQLException diff --git a/testing/trino-tests/src/test/java/io/trino/tests/TestQuerySerializationFailures.java b/testing/trino-tests/src/test/java/io/trino/tests/TestQuerySerializationFailures.java index 19cf90a7b95c..ed3b24d126b6 100644 --- a/testing/trino-tests/src/test/java/io/trino/tests/TestQuerySerializationFailures.java +++ b/testing/trino-tests/src/test/java/io/trino/tests/TestQuerySerializationFailures.java @@ -23,7 +23,6 @@ import io.trino.testing.AbstractTestQueryFramework; import io.trino.testing.DistributedQueryRunner; import io.trino.testing.QueryRunner; -import io.trino.testng.services.Flaky; import org.junit.jupiter.api.Test; import java.util.Set; @@ -48,7 +47,6 @@ protected QueryRunner createQueryRunner() } @Test - @Flaky(issue = "https://github.com/trinodb/trino/issues/4173", match = "\\QExpected query to fail: SELECT * FROM (VALUES BOGUS(true), BOGUS(false), BOGUS(true))") public void shouldFailOnFirstSerializationError() { // BOGUS(value) returns BogusType that fails to serialize when value is true