1 files changed, 12 insertions, 9 deletions
diff --git a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
index c998f84ec5a..57d0abd980b 100644
--- a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
+++ b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
@@ -4,6 +4,7 @@ package com.yahoo.messagebus.jdisc.test;
 import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.jrt.slobrok.server.Slobrok;
 import com.yahoo.messagebus.*;
+import com.yahoo.messagebus.network.local.LocalNetwork;
 import com.yahoo.messagebus.network.rpc.RPCNetwork;
 import com.yahoo.messagebus.network.rpc.RPCNetworkParams;
 import com.yahoo.messagebus.test.SimpleProtocol;
@@ -21,11 +22,13 @@ public class RemoteClient {
     private final ReplyQueue queue = new ReplyQueue();
     private final SourceSession session;
 
-    private RemoteClient(Slobrok slobrok, String slobrokId, Protocol protocol) {
+    private RemoteClient(Slobrok slobrok, String slobrokId, Protocol protocol, boolean network) {
         this.slobrok = slobrok;
         this.slobrokId = slobrok != null ? slobrok.configId() : slobrokId;
-        mbus = new MessageBus(new RPCNetwork(new RPCNetworkParams().setSlobrokConfigId(this.slobrokId)),
-                              new MessageBusParams().addProtocol(protocol));
+        mbus = network
+               ? new MessageBus(new RPCNetwork(new RPCNetworkParams().setSlobrokConfigId(this.slobrokId)),
+                                new MessageBusParams().addProtocol(protocol))
+               : new MessageBus(new LocalNetwork(), new MessageBusParams().addProtocol(protocol));
         session = mbus.createSourceSession(new SourceSessionParams().setThrottlePolicy(null).setReplyHandler(queue));
     }
 
@@ -49,16 +52,16 @@ public class RemoteClient {
         }
     }
 
-    public static RemoteClient newInstanceWithInternSlobrok() {
-        return new RemoteClient(newSlobrok(), null, new SimpleProtocol());
+    public static RemoteClient newInstanceWithInternSlobrok(boolean network) {
+        return new RemoteClient(newSlobrok(), null, new SimpleProtocol(), network);
     }
 
-    public static RemoteClient newInstanceWithExternSlobrok(String slobrokId) {
-        return new RemoteClient(null, slobrokId, new SimpleProtocol());
+    public static RemoteClient newInstanceWithExternSlobrok(String slobrokId, boolean network) {
+        return new RemoteClient(null, slobrokId, new SimpleProtocol(), network);
     }
 
-    public static RemoteClient newInstanceWithProtocolAndInternSlobrok(Protocol protocol) {
-        return new RemoteClient(newSlobrok(), null, protocol);
+    public static RemoteClient newInstanceWithProtocolAndInternSlobrok(Protocol protocol, boolean network) {
+        return new RemoteClient(newSlobrok(), null, protocol, network);
     }
 
     private static Slobrok newSlobrok() {