diff options
6 files changed, 10 insertions, 8 deletions
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java index 9ee58f746a5..473b9c9d5dd 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java @@ -42,7 +42,7 @@ public class PolicyFactoryTestCase { public void setUp() throws ListenFailedException { slobrok = new Slobrok(); srv = new TestServer(new MessageBusParams().addProtocol(new DocumentProtocol(new DocumentTypeManager())), - new RPCNetworkParams().setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); + new RPCNetworkParams().setNumNetworkThreads(1).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); src = srv.mb.createSourceSession(new SourceSessionParams().setReplyHandler(new Receptor())); } diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java index b2fce64f784..a067261ba1a 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java @@ -80,7 +80,7 @@ public class PolicyTestFrame { e.printStackTrace(); fail(e.getMessage()); } - net = new MyNetwork(new RPCNetworkParams() + net = new MyNetwork(new RPCNetworkParams().setNumNetworkThreads(1) .setIdentity(new Identity(identity)) .setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); mbus = new MessageBus(net, new MessageBusParams() diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/RoutableFactoryTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/RoutableFactoryTestCase.java index cde6a7484ea..51728b67347 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/RoutableFactoryTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/RoutableFactoryTestCase.java @@ -51,11 +51,11 @@ public class RoutableFactoryTestCase { DocumentTypeManager docMan = new DocumentTypeManager(); dstProtocol = new DocumentProtocol(docMan); dstServer = new TestServer(new MessageBusParams().addProtocol(dstProtocol), - new RPCNetworkParams().setIdentity(new Identity("dst")).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); + new RPCNetworkParams().setNumNetworkThreads(1).setIdentity(new Identity("dst")).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); dstSession = dstServer.mb.createDestinationSession(new DestinationSessionParams().setName("session").setMessageHandler(new Receptor())); srcProtocol = new DocumentProtocol(docMan); srcServer = new TestServer(new MessageBusParams().addProtocol(srcProtocol), - new RPCNetworkParams().setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); + new RPCNetworkParams().setNumNetworkThreads(1).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); srcSession = srcServer.mb.createSourceSession(new SourceSessionParams().setReplyHandler(new Receptor())); assertTrue(srcServer.waitSlobrok("dst/session", 1)); } diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/Destination.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/Destination.java index 0670358f097..06f82168447 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/Destination.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/Destination.java @@ -47,7 +47,7 @@ public class Destination implements MessageHandler { access = new LocalDocumentAccess(params); local = access.createSyncSession(new SyncParameters.Builder().build()); bus = new RPCMessageBus(Arrays.asList((Protocol)new DocumentProtocol(access.getDocumentTypeManager())), - new RPCNetworkParams() + new RPCNetworkParams().setNumNetworkThreads(1) .setIdentity(new Identity("test/destination")) .setSlobrokConfigId(slobrokConfigId), "file:src/test/cfg/messagebus.cfg"); 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(); |