Skip to content

Commit b468f1d

Browse files
committed
Skip the tests for non-http implementation
1 parent 702a638 commit b468f1d

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import com.clickhouse.client.data.ClickHouseStringValue;
4646

4747
import org.testng.Assert;
48+
import org.testng.SkipException;
4849
import org.testng.annotations.DataProvider;
4950
import org.testng.annotations.Test;
5051

@@ -1262,7 +1263,7 @@ public void testTempTable() throws Exception {
12621263
public void testErrorDuringInsert() throws Exception {
12631264
ClickHouseNode server = getServer();
12641265
if (server.getProtocol() != ClickHouseProtocol.HTTP) {
1265-
return;
1266+
throw new SkipException("Skip as only http implementation works well");
12661267
}
12671268
ClickHouseClient.send(server, "drop table if exists error_during_insert",
12681269
"create table error_during_insert(n UInt64, flag UInt8)engine=Null").get();
@@ -1288,7 +1289,7 @@ public void testErrorDuringInsert() throws Exception {
12881289
public void testErrorDuringQuery() throws Exception {
12891290
ClickHouseNode server = getServer();
12901291
if (server.getProtocol() != ClickHouseProtocol.HTTP) {
1291-
return;
1292+
throw new SkipException("Skip as only http implementation works well");
12921293
}
12931294
String query = "select number, throwIf(number>=100000000) from numbers(500000000)";
12941295
long count = 0L;

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java

+5
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@
3333
import com.clickhouse.client.ClickHouseDataType;
3434
import com.clickhouse.client.ClickHouseParameterizedQuery;
3535
import com.clickhouse.client.ClickHouseProtocol;
36+
import com.clickhouse.client.ClickHouseRequest;
3637
import com.clickhouse.client.ClickHouseValues;
3738
import com.clickhouse.client.config.ClickHouseClientOption;
3839
import com.clickhouse.client.data.ClickHouseDateTimeValue;
3940
import com.clickhouse.client.http.config.ClickHouseHttpOption;
4041

4142
import org.testng.Assert;
43+
import org.testng.SkipException;
4244
import org.testng.annotations.DataProvider;
4345
import org.testng.annotations.Test;
4446

@@ -73,6 +75,9 @@ public void testSocketTimeout() throws SQLException {
7375
props.setProperty("database", "system");
7476
try (ClickHouseConnection conn = newConnection(props);
7577
ClickHouseStatement stmt = conn.createStatement()) {
78+
if (stmt.unwrap(ClickHouseRequest.class).getServer().getProtocol() != ClickHouseProtocol.HTTP) {
79+
throw new SkipException("Skip as only http implementation works well");
80+
}
7681
stmt.executeQuery("select sleep(3)");
7782
Assert.fail("Should throw timeout exception");
7883
} catch (SQLException e) {

0 commit comments

Comments
 (0)