andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Ignore some test-flakiness when using Java11+ due outstanding Java11 bug. (#7984)" (#8035)

Browse Source 
Motivation:

This reverts commit 4b728cd5bc53195bced516f33a1ea0a0def5604e as it was fixes in Java 11 ea+17.

Modification:

Revert previous added workaround as this is fixed in Java 11 now.

Result:

No more workaround for test included.
This commit is contained in:
Norman Maurer 2018-06-19 08:11:10 +02:00 committed by GitHub
parent 2d47005901
commit 370de7c446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testsuite/src/main/java/io/netty/testsuite/transport/socket/SocketHalfClosedTest.java
View File

@ -33,9 +33,7 @@ import io.netty.channel.socket.ChannelInputShutdownEvent;
import io.netty.channel.socket.ChannelInputShutdownReadComplete; import io.netty.channel.socket.ChannelInputShutdownReadComplete;
import io.netty.channel.socket.ChannelOutputShutdownEvent; import io.netty.channel.socket.ChannelOutputShutdownEvent;
import io.netty.channel.socket.DuplexChannel; import io.netty.channel.socket.DuplexChannel;
import io.netty.channel.socket.oio.OioSocketChannel;
import io.netty.util.UncheckedBooleanSupplier; import io.netty.util.UncheckedBooleanSupplier;
import io.netty.util.internal.PlatformDependent;
import org.junit.Test; import org.junit.Test;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
@ -416,26 +414,19 @@ public class SocketHalfClosedTest extends AbstractSocketTest {
@Override @Override
public void channelInactive(ChannelHandlerContext ctx) { public void channelInactive(ChannelHandlerContext ctx) {
checkPrematureClose(ctx); checkPrematureClose();
} }
@Override @Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ctx.close(); ctx.close();
checkPrematureClose(ctx); checkPrematureClose();
} }
private void checkPrematureClose(ChannelHandlerContext ctx) { private void checkPrematureClose() {
if (bytesRead < expectedBytes || !seenOutputShutdown) { if (bytesRead < expectedBytes || !seenOutputShutdown) {
if (ctx.channel() instanceof OioSocketChannel && seenOutputShutdown causeRef.set(new IllegalStateException("leader premature close"));
&& PlatformDependent.javaVersion() >= 11) { doneLatch.countDown();
// If we are using OIO and are using Java11 this is expected atm.
// See http://mail.openjdk.java.net/pipermail/net-dev/2018-May/011511.html.
doneLatch.countDown();
} else {
causeRef.set(new IllegalStateException("leader premature close"));
doneLatch.countDown();
}
} }
} }
} }