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

Fix 'incompatible event loop' regression

Browse Source 
Motivation:

Previous commit (2de65e25e9) introduced a regression that makes the epoll testsuite fail with an 'incompatible event loop' error.

Modifications:

Use the correct event loop type.

Result:

Build doesn't fail anymore.
This commit is contained in:
Trustin Lee 2014-03-17 09:51:16 +09:00
parent eda702b6ab
commit bcd11d1ac2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollTestUtils.java
View File

@ -18,7 +18,6 @@ package io.netty.channel.epoll;
import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.Bootstrap;
import io.netty.bootstrap.ServerBootstrap; import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.EventLoopGroup; import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.testsuite.transport.TestsuitePermutation; import io.netty.testsuite.transport.TestsuitePermutation;
import io.netty.util.concurrent.DefaultThreadFactory; import io.netty.util.concurrent.DefaultThreadFactory;
@ -31,9 +30,9 @@ final class EpollTestUtils {
private static final int WORKERS = 3; private static final int WORKERS = 3;
private static final EventLoopGroup epollBossGroup = private static final EventLoopGroup epollBossGroup =
new NioEventLoopGroup(BOSSES, new DefaultThreadFactory("testsuite-epoll-boss", true)); new EpollEventLoopGroup(BOSSES, new DefaultThreadFactory("testsuite-epoll-boss", true));
private static final EventLoopGroup epollWorkerGroup = private static final EventLoopGroup epollWorkerGroup =
new NioEventLoopGroup(WORKERS, new DefaultThreadFactory("testsuite-epoll-worker", true)); new EpollEventLoopGroup(WORKERS, new DefaultThreadFactory("testsuite-epoll-worker", true));
static List<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>> newFactories() { static List<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>> newFactories() {
return Collections.<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>>singletonList( return Collections.<TestsuitePermutation.BootstrapComboFactory<ServerBootstrap, Bootstrap>>singletonList(