Fixed (ICE-5855) - IceJS exceptionBidir passes but prints all the exceptions in the server console

4 files changed, 7 insertions, 4 deletions

diff --git a/js/test/Common/Controller.ice b/js/test/Common/Controller.ice
index 65d0698913a..6816790ba33 100644
--- a/js/test/Common/Controller.ice
+++ b/js/test/Common/Controller.ice
@@ -18,7 +18,7 @@ interface Server
 
 interface Controller
 {
-    Server* runServer(string lang, string name, string protocol, string host);
+    Server* runServer(string lang, string name, string protocol, string host, string options);
 };
 
 };
diff --git a/js/test/Common/TestSuite.js b/js/test/Common/TestSuite.js
index 756dbec9cba..7ea921802f2 100644
--- a/js/test/Common/TestSuite.js
+++ b/js/test/Common/TestSuite.js
@@ -67,19 +67,21 @@ $(document).foundation();
 
                     var p;
                     var server;
+                    var options = "";
                     if(typeof(__runServer__) !== "undefined" || typeof(__runEchoServer__) !== "undefined")
                     {
                         var srv;
                         if(typeof(__runEchoServer__) !== "undefined")
                         {
                             srv = "Ice/echo";
+                            options = __runEchoServerOptions__ || ""
                         }
                         else
                         {
                             srv = current;
                         }
                         out.write("starting " + srv + " server... ");
-                        p = controller.runServer(language, srv, protocol, defaultHost).then(
+                        p = controller.runServer(language, srv, protocol, defaultHost, options).then(
                             function(proxy)
                             {
                                 var ref = proxy.ice_getIdentity().name + ":" + protocol + " -h " + defaultHost +
diff --git a/js/test/Common/run.py b/js/test/Common/run.py
index 13e9fe76d77..a0975bf303f 100755
--- a/js/test/Common/run.py
+++ b/js/test/Common/run.py
@@ -84,7 +84,7 @@ class ControllerI(Test.Controller):
     def __init__(self):
         self.currentServer = None
 
-    def runServer(self, lang, name, protocol, host, current):
+    def runServer(self, lang, name, protocol, host, options, current):
 
         # If server is still running, terminate it
         if self.currentServer:
@@ -112,7 +112,7 @@ class ControllerI(Test.Controller):
             serverCfg = TestUtil.DriverConfig("server")
             serverCfg.protocol = protocol
             serverCfg.host = host
-            server = TestUtil.getCommandLine(server, serverCfg)
+            server = TestUtil.getCommandLine(server, serverCfg, options)
             serverProc = TestUtil.spawnServer(server, env = serverenv, lang=serverCfg.lang, mx=serverCfg.mx)
             print("ok")
         finally:
diff --git a/js/test/Ice/exceptionsBidir/Client.js b/js/test/Ice/exceptionsBidir/Client.js
index 2cda879f0c0..10e0d07a46a 100644
--- a/js/test/Ice/exceptionsBidir/Client.js
+++ b/js/test/Ice/exceptionsBidir/Client.js
@@ -98,6 +98,7 @@
     };
     exports.__test__ = run;
     exports.__runEchoServer__ = true;
+    exports.__runEchoServerOptions__ = "--Ice.Warn.Dispatch=0 --Ice.Warn.Connections=0";
 }
 (typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
  typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : window.Ice.__require,