diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-12-16 14:43:20 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-12-16 14:43:44 +0000 |
commit | 7f825e71fb23b2ebb6047efe088746a7cbccc917 (patch) | |
tree | 09cd1eb651b9586bd8bb68fec1d2404f9e1b8721 /messagebus | |
parent | 9a4a247b44beed310a9bb2441ad1feb1610aaf06 (diff) |
most unit tests can run with just 1 network thread
Diffstat (limited to 'messagebus')
-rw-r--r-- | messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java | 2 | ||||
-rw-r--r-- | messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java index 8b51599d15c..b130b694770 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java @@ -48,6 +48,7 @@ public class TestServer { this(new MessageBusParams().addProtocol(new SimpleProtocol()), new RPCNetworkParams() .setIdentity(new Identity(name)) + .setNumNetworkThreads(1) .setSlobrokConfigId(getSlobrokConfig(slobrok))); if (protocol != null) { mb.putProtocol(protocol); @@ -62,6 +63,7 @@ public class TestServer { public TestServer(MessageBusParams mbusParams, Slobrok slobrok) { this(mbusParams, new RPCNetworkParams() + .setNumNetworkThreads(1) .setSlobrokConfigId(getSlobrokConfig(slobrok))); log.log(Level.INFO, "Running testServer <unnamed> at "+net.getConnectionSpec()+", location broker at "+slobrok.port()); } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java index 044ee87f4c4..931fed596e5 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java @@ -85,9 +85,9 @@ public class SlobrokTestCase { public void setUp() throws ListenFailedException { slobrok = new Slobrok(); String slobrokCfgId = "raw:slobrok[1]\nslobrok[0].connectionspec \"" + new Spec("localhost", slobrok.port()).toString() + "\"\n"; - net1 = new RPCNetwork(new RPCNetworkParams().setIdentity(new Identity("net/a")).setSlobrokConfigId(slobrokCfgId)); - net2 = new RPCNetwork(new RPCNetworkParams().setIdentity(new Identity("net/b")).setSlobrokConfigId(slobrokCfgId)); - net3 = new RPCNetwork(new RPCNetworkParams().setIdentity(new Identity("net/c")).setSlobrokConfigId(slobrokCfgId)); + net1 = new RPCNetwork(new RPCNetworkParams().setNumNetworkThreads(1).setIdentity(new Identity("net/a")).setSlobrokConfigId(slobrokCfgId)); + net2 = new RPCNetwork(new RPCNetworkParams().setNumNetworkThreads(1).setIdentity(new Identity("net/b")).setSlobrokConfigId(slobrokCfgId)); + net3 = new RPCNetwork(new RPCNetworkParams().setNumNetworkThreads(1).setIdentity(new Identity("net/c")).setSlobrokConfigId(slobrokCfgId)); port1 = net1.getPort(); port2 = net2.getPort(); port3 = net3.getPort(); |