From ad7d009710426ebf6097a525251285de69bf7c2b Mon Sep 17 00:00:00 2001
From: Yuya Ebihara <yuya.ebihara@starburstdata.com>
Date: Fri, 18 Feb 2022 10:30:09 +0900
Subject: [PATCH] Enable TestAltinityConnectorSmokeTest in ClickHouse connector

The server version it was upgraded in 01960182736928059220ee56e845b6447ab78518
doesn't cause flaky issues with new driver package.
---
 plugin/trino-clickhouse/pom.xml               | 23 -------------------
 .../TestAltinityConnectorSmokeTest.java       |  3 +--
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/plugin/trino-clickhouse/pom.xml b/plugin/trino-clickhouse/pom.xml
index 252fa0327477..4c82e601bd1f 100644
--- a/plugin/trino-clickhouse/pom.xml
+++ b/plugin/trino-clickhouse/pom.xml
@@ -180,27 +180,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <!-- TODO (https://github.com/trinodb/trino/issues/10752) Enable after resolving flaky test issues -->
-                                <exclude>**/TestAltinityConnectorSmokeTest.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestAltinityConnectorSmokeTest.java b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestAltinityConnectorSmokeTest.java
index 640fc5a1c35d..61fec3e156d6 100644
--- a/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestAltinityConnectorSmokeTest.java
+++ b/plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestAltinityConnectorSmokeTest.java
@@ -32,7 +32,6 @@ protected QueryRunner createQueryRunner()
                 ImmutableMap.of(),
                 ImmutableMap.<String, String>builder()
                         .put("clickhouse.map-string-as-varchar", "true") // To handle string types in TPCH tables as varchar instead of varbinary
-                        .put("clickhouse.legacy-driver", "true")
                         .buildOrThrow(),
                 REQUIRED_TPCH_TABLES);
     }
@@ -42,6 +41,6 @@ public void testRenameSchema()
     {
         // Override because RENAME DATABASE statement isn't supported in Altinity 20.8
         assertThatThrownBy(super::testRenameSchema)
-                .hasMessageMatching("ClickHouse exception, code: 48,.* RENAME DATABASE is not supported.*\\n");
+                .hasMessageContaining("RENAME DATABASE is not supported");
     }
 }