Skip to content

Commit 518365e

Browse files
committed
disabled connection ttl test for cloud
1 parent e2ddcd7 commit 518365e

File tree

2 files changed

+21
-24
lines changed

2 files changed

+21
-24
lines changed

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ApacheHttpConnectionImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
2727
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
2828
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
29-
import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
3029
import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
3130
import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
3231
import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
@@ -38,7 +37,6 @@
3837
import org.apache.hc.core5.http.NoHttpResponseException;
3938
import org.apache.hc.core5.http.config.Registry;
4039
import org.apache.hc.core5.http.config.RegistryBuilder;
41-
import org.apache.hc.core5.http.io.HttpConnectionFactory;
4240
import org.apache.hc.core5.http.io.SocketConfig;
4341
import org.apache.hc.core5.http.io.entity.EntityUtils;
4442
import org.apache.hc.core5.http.protocol.HttpContext;

clickhouse-http-client/src/test/java/com/clickhouse/client/http/ApacheHttpConnectionImplTest.java

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,35 @@
1515
import com.clickhouse.client.http.config.HttpConnectionProvider;
1616
import com.clickhouse.config.ClickHouseOption;
1717
import com.clickhouse.data.ClickHouseUtils;
18-
19-
import java.io.IOException;
20-
import java.io.Serializable;
21-
import java.net.ConnectException;
22-
import java.net.Socket;
23-
import java.nio.ByteBuffer;
24-
import java.util.Collections;
25-
import java.util.HashMap;
26-
import java.util.List;
27-
import java.util.Map;
28-
import java.util.Random;
29-
import java.util.TreeMap;
30-
import java.util.concurrent.atomic.AtomicBoolean;
31-
import java.util.concurrent.atomic.AtomicInteger;
32-
3318
import com.github.tomakehurst.wiremock.WireMockServer;
3419
import com.github.tomakehurst.wiremock.client.WireMock;
35-
import com.github.tomakehurst.wiremock.client.WireMockBuilder;
3620
import com.github.tomakehurst.wiremock.common.Slf4jNotifier;
3721
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
3822
import com.github.tomakehurst.wiremock.http.Fault;
39-
import com.github.tomakehurst.wiremock.http.trafficlistener.CollectingNetworkTrafficListener;
4023
import com.github.tomakehurst.wiremock.http.trafficlistener.WiremockNetworkTrafficListener;
4124
import com.github.tomakehurst.wiremock.stubbing.Scenario;
42-
import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
4325
import com.github.tomakehurst.wiremock.stubbing.StubMapping;
4426
import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
4527
import org.apache.hc.core5.http.HttpStatus;
4628
import org.apache.hc.core5.net.URIBuilder;
47-
import org.testcontainers.shaded.org.checkerframework.checker.units.qual.A;
4829
import org.testng.Assert;
4930
import org.testng.annotations.DataProvider;
5031
import org.testng.annotations.Ignore;
5132
import org.testng.annotations.Test;
52-
import org.testng.collections.Maps;
33+
34+
import java.io.IOException;
35+
import java.io.Serializable;
36+
import java.net.ConnectException;
37+
import java.net.Socket;
38+
import java.nio.ByteBuffer;
39+
import java.util.Collections;
40+
import java.util.HashMap;
41+
import java.util.List;
42+
import java.util.Map;
43+
import java.util.Random;
44+
import java.util.TreeMap;
45+
import java.util.concurrent.atomic.AtomicBoolean;
46+
import java.util.concurrent.atomic.AtomicInteger;
5347

5448
public class ApacheHttpConnectionImplTest extends ClickHouseHttpClientTest {
5549
public static class CustomSocketFactory implements ClickHouseSocketFactory {
@@ -284,7 +278,12 @@ public static Object[] validationTimeoutProvider() {
284278
}
285279

286280
@Test(groups = {"integration"},dataProvider = "testConnectionTTLProvider")
281+
@SuppressWarnings("java:S2925")
287282
public void testConnectionTTL(Map<ClickHouseOption, Serializable> options, int openSockets) throws Exception {
283+
if (isCloud()) {
284+
// skip for cloud because wiremock proxy need extra configuration. TODO: need to fix it
285+
return;
286+
}
288287
ClickHouseNode server = getServer(ClickHouseProtocol.HTTP);
289288

290289
int proxyPort = new Random().nextInt(1000) + 10000;
@@ -361,12 +360,12 @@ public void opened(Socket socket) {
361360

362361
@Override
363362
public void incoming(Socket socket, ByteBuffer bytes) {
364-
363+
// ignore
365364
}
366365

367366
@Override
368367
public void outgoing(Socket socket, ByteBuffer bytes) {
369-
368+
// ignore
370369
}
371370

372371
@Override

0 commit comments

Comments
 (0)