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

Fix EpollSocketTestPermutation after bad cherry-pick

Browse Source
This commit is contained in:
Norman Maurer 2021-03-15 09:27:26 +01:00
parent e5ff6216ff
commit 06ddb1f45e
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTestPermutation.java
View File

@ -91,10 +91,10 @@ class EpollSocketTestPermutation extends SocketTestPermutation {
@Override @Override
public List<BootstrapFactory<Bootstrap>> clientSocket() { public List<BootstrapFactory<Bootstrap>> clientSocket() {
return Arrays.asList( List<BootstrapFactory<Bootstrap>> toReturn = new ArrayList<BootstrapFactory<Bootstrap>>();
() -> new Bootstrap().group(EPOLL_WORKER_GROUP).channel(EpollSocketChannel.class), toReturn.add(() -> new Bootstrap().group(EPOLL_WORKER_GROUP).channel(EpollSocketChannel.class));
() -> new Bootstrap().group(nioWorkerGroup).channel(NioSocketChannel.class) toReturn.add(() -> new Bootstrap().group(nioWorkerGroup).channel(NioSocketChannel.class));
); return toReturn;
} }
@Override @Override
@ -103,13 +103,8 @@ class EpollSocketTestPermutation extends SocketTestPermutation {
if (IS_SUPPORTING_TCP_FASTOPEN_CLIENT) { if (IS_SUPPORTING_TCP_FASTOPEN_CLIENT) {
int insertIndex = factories.size() - 1; // Keep NIO fixture last. int insertIndex = factories.size() - 1; // Keep NIO fixture last.
factories.add(insertIndex, new BootstrapFactory<Bootstrap>() { factories.add(insertIndex, () -> new Bootstrap().group(EPOLL_WORKER_GROUP).channel(EpollSocketChannel.class)
@Override .option(ChannelOption.TCP_FASTOPEN_CONNECT, true));
public Bootstrap newInstance() {
return new Bootstrap().group(EPOLL_WORKER_GROUP).channel(EpollSocketChannel.class)
.option(ChannelOption.TCP_FASTOPEN_CONNECT, true);
}
});
} }
return clientSocket(); return clientSocket();
} }