Skip to content

Commit af276cb

Browse files
violetaggvioletagg
committed
Merge #3759 into 1.2.6
Signed-off-by: Violeta Georgieva <696661+violetagg@users.noreply.github.com>
2 parents bb8e826 + 013decb commit af276cb

File tree

3 files changed

+30
-1
lines changed

3 files changed

+30
-1
lines changed

‎reactor-netty-core/src/test/java/reactor/netty/tcp/TcpClientTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import io.netty.util.NetUtil;
6060
import org.junit.jupiter.api.AfterEach;
6161
import org.junit.jupiter.api.BeforeEach;
62+
import org.junit.jupiter.api.Disabled;
6263
import org.junit.jupiter.api.Test;
6364
import org.reactivestreams.Publisher;
6465
import reactor.core.publisher.Flux;
@@ -796,11 +797,13 @@ public void close() throws IOException {
796797

797798

798799
@Test
800+
@Disabled
799801
void testIssue600_1() {
800802
doTestIssue600(true);
801803
}
802804

803805
@Test
806+
@Disabled
804807
void testIssue600_2() {
805808
doTestIssue600(false);
806809
}
@@ -927,6 +930,7 @@ private void connect(TcpClient client, boolean reconnect, CountDownLatch latch)
927930
}
928931

929932
@Test
933+
@Disabled
930934
void testIssue585_1() throws Exception {
931935
DisposableServer server =
932936
TcpServer.create()
@@ -987,6 +991,7 @@ void testIssue585_1() throws Exception {
987991
}
988992

989993
@Test
994+
@Disabled
990995
void testIssue585_2() throws Exception {
991996
DisposableServer server =
992997
TcpServer.create()
@@ -1201,6 +1206,7 @@ void testBootstrapUnsupported() {
12011206

12021207
@Test
12031208
@SuppressWarnings("deprecation")
1209+
@Disabled
12041210
void testBootstrap() {
12051211
DisposableServer server =
12061212
TcpServer.create()

‎reactor-netty-core/src/test/java/reactor/netty/tcp/TcpServerTests.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011-2024 VMware, Inc. or its affiliates, All Rights Reserved.
2+
* Copyright (c) 2011-2025 VMware, Inc. or its affiliates, All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -66,6 +66,7 @@
6666
import io.netty.util.concurrent.EventExecutor;
6767
import org.junit.jupiter.api.AfterAll;
6868
import org.junit.jupiter.api.BeforeAll;
69+
import org.junit.jupiter.api.Disabled;
6970
import org.junit.jupiter.api.Test;
7071
import org.junit.jupiter.api.Timeout;
7172
import org.junit.jupiter.params.ParameterizedTest;
@@ -793,6 +794,7 @@ void testEchoWithLineBasedFrameDecoder() throws Exception {
793794
}
794795

795796
@Test
797+
@Disabled
796798
void testChannelGroupClosesAllConnections() throws Exception {
797799
ChannelGroup group = new DefaultChannelGroup(executor);
798800

@@ -828,6 +830,7 @@ void testChannelGroupClosesAllConnections() throws Exception {
828830
}
829831

830832
@Test
833+
@Disabled
831834
void testIssue688() throws Exception {
832835
CountDownLatch connected = new CountDownLatch(1);
833836
CountDownLatch configured = new CountDownLatch(1);
@@ -872,6 +875,7 @@ else if (newState == ConnectionObserver.State.DISCONNECTING) {
872875
}
873876

874877
@Test
878+
@Disabled
875879
@SuppressWarnings("FutureReturnValueIgnored")
876880
void testHalfClosedConnection() throws Exception {
877881
DisposableServer server =
@@ -920,6 +924,7 @@ void testHalfClosedConnection() throws Exception {
920924
}
921925

922926
@Test
927+
@Disabled
923928
void testGracefulShutdown() throws Exception {
924929
CountDownLatch latch1 = new CountDownLatch(2);
925930
CountDownLatch latch2 = new CountDownLatch(2);
@@ -1127,6 +1132,7 @@ void testDisposeTimeoutLongOverflow() {
11271132
}
11281133

11291134
@Test
1135+
@Disabled
11301136
@SuppressWarnings("deprecation")
11311137
void testSniSupport() throws Exception {
11321138
SelfSignedCertificate defaultCert = new SelfSignedCertificate("default");
@@ -1240,6 +1246,7 @@ void testTcpServerCancelled() throws InterruptedException {
12401246
}
12411247

12421248
@ParameterizedTest
1249+
@Disabled
12431250
@ValueSource(booleans = {true, false})
12441251
void testIssue3406(boolean singleInvocation) {
12451252
DisposableServer server = null;

‎reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@ void gettingOptionsDuplicates() {
594594
}
595595

596596
@Test
597+
@Disabled
597598
void sslExchangeRelativeGet() throws SSLException {
598599
SslContext sslServer = SslContextBuilder.forServer(ssc.certificate(), ssc.privateKey())
599600
.build();
@@ -1682,6 +1683,7 @@ private void doTestIssue600(boolean withLoop) {
16821683
}
16831684

16841685
@Test
1686+
@Disabled
16851687
void testChannelGroupClosesAllConnections() throws Exception {
16861688
disposableServer =
16871689
createServer()
@@ -2020,6 +2022,7 @@ private Object getValueReflection(Object obj, String fieldName, int superLevel)
20202022
}
20212023

20222024
@Test
2025+
@Disabled
20232026
void testDoOnRequestInvokedBeforeSendingRequest() {
20242027
disposableServer =
20252028
createServer()
@@ -2060,24 +2063,28 @@ void testIssue719_CLWithTextNoSSL() {
20602063
}
20612064

20622065
@Test
2066+
@Disabled
20632067
void testIssue719_TENoTextNoSSL() {
20642068
doTestIssue719(ByteBufFlux.fromString(Mono.just("")),
20652069
h -> h.set("Transfer-Encoding", "chunked"), false);
20662070
}
20672071

20682072
@Test
2073+
@Disabled
20692074
void testIssue719_CLNoTextNoSSL() {
20702075
doTestIssue719(ByteBufFlux.fromString(Mono.just("")),
20712076
h -> h.set("Content-Length", "0"), false);
20722077
}
20732078

20742079
@Test
2080+
@Disabled
20752081
void testIssue719_TEWithTextWithSSL() {
20762082
doTestIssue719(ByteBufFlux.fromString(Mono.just("test")),
20772083
h -> h.set("Transfer-Encoding", "chunked"), true);
20782084
}
20792085

20802086
@Test
2087+
@Disabled
20812088
void testIssue719_CLWithTextWithSSL() {
20822089
doTestIssue719(ByteBufFlux.fromString(Mono.just("test")),
20832090
h -> h.set("Content-Length", "4"), true);
@@ -2090,6 +2097,7 @@ void testIssue719_TENoTextWithSSL() {
20902097
}
20912098

20922099
@Test
2100+
@Disabled
20932101
void testIssue719_CLNoTextWithSSL() {
20942102
doTestIssue719(ByteBufFlux.fromString(Mono.just("")),
20952103
h -> h.set("Content-Length", "0"), true);
@@ -2237,6 +2245,7 @@ private void doTestIssue777_2(HttpClient client, String uri, String expectation,
22372245
}
22382246

22392247
@Test
2248+
@Disabled
22402249
void testConnectionIdleTimeFixedPool() throws Exception {
22412250
ConnectionProvider provider =
22422251
ConnectionProvider.builder("testConnectionIdleTimeFixedPool")
@@ -2271,6 +2280,7 @@ void testConnectionNoIdleTimeFixedPool() throws Exception {
22712280
}
22722281

22732282
@Test
2283+
@Disabled
22742284
void testConnectionNoIdleTimeElasticPool() throws Exception {
22752285
ConnectionProvider provider =
22762286
ConnectionProvider.create("testConnectionNoIdleTimeElasticPool", Integer.MAX_VALUE);
@@ -2302,6 +2312,7 @@ private ChannelId[] doTestConnectionIdleTime(ConnectionProvider provider) throws
23022312
}
23032313

23042314
@Test
2315+
@Disabled
23052316
void testConnectionLifeTimeFixedPoolHttp1() throws Exception {
23062317
ConnectionProvider provider =
23072318
ConnectionProvider.builder("testConnectionLifeTimeFixedPoolHttp1")
@@ -2321,6 +2332,7 @@ void testConnectionLifeTimeFixedPoolHttp1() throws Exception {
23212332
}
23222333

23232334
@Test
2335+
@Disabled
23242336
@SuppressWarnings("deprecation")
23252337
void testConnectionLifeTimeFixedPoolHttp2_1() throws Exception {
23262338
Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
@@ -2430,6 +2442,7 @@ void testConnectionNoLifeTimeFixedPoolHttp2() throws Exception {
24302442
}
24312443

24322444
@Test
2445+
@Disabled
24332446
void testConnectionNoLifeTimeElasticPoolHttp1() throws Exception {
24342447
ConnectionProvider provider =
24352448
ConnectionProvider.create("testConnectionNoLifeTimeElasticPoolHttp1", Integer.MAX_VALUE);
@@ -2445,6 +2458,7 @@ void testConnectionNoLifeTimeElasticPoolHttp1() throws Exception {
24452458
}
24462459

24472460
@Test
2461+
@Disabled
24482462
@SuppressWarnings("deprecation")
24492463
void testConnectionNoLifeTimeElasticPoolHttp2() throws Exception {
24502464
Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
@@ -2492,6 +2506,7 @@ private ChannelId[] doTestConnectionLifeTime(HttpServer server, HttpClient clien
24922506
}
24932507

24942508
@Test
2509+
@Disabled
24952510
@SuppressWarnings("deprecation")
24962511
void testConnectionLifeTimeFixedPoolHttp2_2() {
24972512
Http2SslContextSpec serverCtx = Http2SslContextSpec.forServer(ssc.certificate(), ssc.privateKey());
@@ -3069,6 +3084,7 @@ void testNoEvictInBackground() throws Exception {
30693084
}
30703085

30713086
@Test
3087+
@Disabled
30723088
void testEvictInBackground() throws Exception {
30733089
doTestEvictInBackground(0, true);
30743090
}

0 commit comments

Comments
 (0)