Fixed JS operationsBidir test dispatch warning (ICE-6585)

2 files changed, 21 insertions, 10 deletions

diff --git a/js/test/Ice/operations/BatchOneways.js b/js/test/Ice/operations/BatchOneways.js
index baace89f92a..d1eeae89378 100644
--- a/js/test/Ice/operations/BatchOneways.js
+++ b/js/test/Ice/operations/BatchOneways.js
@@ -85,33 +85,36 @@
                         };
                         return wait(0);
                     }
-                ).then(
-                    function()
-                    {
-                        return prx;
-                    });
+                );
             }
         ).then(
-            function(prx)
+            function()
             {
                 batch2 = prx.ice_batchOneway();
-
                 return Promise.all(batch.ice_ping(), batch2.ice_ping());
             }
         ).then(
-            function()
+            function(count)
             {
                 return batch.ice_flushBatchRequests();
             }
         ).then(
             function()
             {
+                return prx.opByteSOnewayCallCount();
+            }
+        ).then(
+            function()
+            {
                 return batch.ice_getConnection();
             }
         ).then(
             function(con)
             {
-                return con.close(false);
+                if(!bidir)
+                {
+                    return con.close(false);
+                }
             }
         ).then(
             function()
@@ -144,6 +147,11 @@
         ).then(
             function()
             {
+                return prx.opByteSOnewayCallCount();
+            }
+        ).then(
+            function(count)
+            {
                 p.succeed();
             },
             function(ex)
diff --git a/js/test/Ice/operationsBidir/run.py b/js/test/Ice/operationsBidir/run.py
index a2a9972c83d..3f02da50266 100755
--- a/js/test/Ice/operationsBidir/run.py
+++ b/js/test/Ice/operationsBidir/run.py
@@ -19,7 +19,10 @@ path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scri
 if len(path) == 0:
     raise RuntimeError("can't find toplevel directory!")
 sys.path.append(os.path.join(path[0], "scripts"))
+
+operations = os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "operations")
+
 import TestUtil
 
-TestUtil.addPathToEnv("NODE_PATH", os.path.join(os.path.dirname(__file__), "..", "operations"))
+TestUtil.addPathToEnv("NODE_PATH", operations)
 TestUtil.clientEchoTest()