diff options
author | Jose <jose@zeroc.com> | 2018-08-14 20:02:53 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2018-08-14 20:03:24 +0200 |
commit | 7d722e7eb41abd0147458c72285f6fea706c980e (patch) | |
tree | 3d7d1884d6fccfd8a44ab9dabb8d833813aee846 /js | |
parent | Fixed icehashpassword deprecation warning with python debug (diff) | |
download | ice-7d722e7eb41abd0147458c72285f6fea706c980e.tar.bz2 ice-7d722e7eb41abd0147458c72285f6fea706c980e.tar.xz ice-7d722e7eb41abd0147458c72285f6fea706c980e.zip |
Fixes to allow run JavaScript and Python tests with workers
Diffstat (limited to 'js')
36 files changed, 61 insertions, 61 deletions
diff --git a/js/test/Common/TestHelper.js b/js/test/Common/TestHelper.js index 7f51e743fb3..b577c9ad2a6 100644 --- a/js/test/Common/TestHelper.js +++ b/js/test/Common/TestHelper.js @@ -109,8 +109,8 @@ createTestProperties(args = []) { const properties = Ice.createProperties(args); - properties.parseCommandLineOptions("Test", args); - return properties; + args = properties.parseCommandLineOptions("Test", args); + return [properties, args]; } initialize(...args) @@ -129,7 +129,7 @@ } else { - initData.properties = this.createTestProperties(args[0]); + [initData.properties, args[0]] = this.createTestProperties(args[0]); } } @@ -138,7 +138,7 @@ { this._communicator = communicator; } - return communicator; + return [communicator, args[0]]; } communicator() diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js index bc12efb97ce..e970b909118 100644 --- a/js/test/Glacier2/router/Client.js +++ b/js/test/Glacier2/router/Client.js @@ -317,10 +317,10 @@ let communicator; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.Warn.Dispatch", "1"); properties.setProperty("Ice.Warn.Connections", "0"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); await this.allTests(args.indexOf("--shutdown") > -1); } finally diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js index a24d0b5ae88..03186ac81ad 100644 --- a/js/test/Ice/acm/Client.js +++ b/js/test/Ice/acm/Client.js @@ -510,7 +510,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator, args] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/adapterDeactivation/Client.js b/js/test/Ice/adapterDeactivation/Client.js index dd738edcf10..acb5a4a48d2 100644 --- a/js/test/Ice/adapterDeactivation/Client.js +++ b/js/test/Ice/adapterDeactivation/Client.js @@ -227,7 +227,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator, args] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/ami/Client.js b/js/test/Ice/ami/Client.js index cd85473b836..f86ce217baa 100644 --- a/js/test/Ice/ami/Client.js +++ b/js/test/Ice/ami/Client.js @@ -326,7 +326,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator, args] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/binding/Client.js b/js/test/Ice/binding/Client.js index ed7a881c98f..a5950a242ef 100644 --- a/js/test/Ice/binding/Client.js +++ b/js/test/Ice/binding/Client.js @@ -90,7 +90,7 @@ out.writeLine("ok"); await communicator.destroy(); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref)); out.write("testing binding with multiple endpoints... "); @@ -198,7 +198,7 @@ out.writeLine("ok"); await communicator.destroy(); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref)); // @@ -297,7 +297,7 @@ } await communicator.destroy(); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref)); out.write("testing random endpoint selection... "); @@ -344,7 +344,7 @@ out.writeLine("ok"); await communicator.destroy(); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref)); out.write("testing ordered endpoint selection... "); @@ -417,7 +417,7 @@ out.writeLine("ok"); await communicator.destroy(); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref)); out.write("testing per request binding with single endpoint... "); @@ -449,7 +449,7 @@ out.writeLine("ok"); await communicator.destroy(); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref)); out.write("testing per request binding with multiple endpoints... "); @@ -509,7 +509,7 @@ // await communicator.destroy(); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref)); out.write("testing per request binding and ordered endpoint selection... "); @@ -586,7 +586,7 @@ try { const out = this.getWriter(); - communicator = this.initialize(args); + [communicator, args] = this.initialize(args); if(typeof navigator !== 'undefined' && isSafari() && isWorker()) { // diff --git a/js/test/Ice/enums/Client.js b/js/test/Ice/enums/Client.js index 7fdf6b6eece..f892bf166c4 100644 --- a/js/test/Ice/enums/Client.js +++ b/js/test/Ice/enums/Client.js @@ -174,7 +174,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/exceptions/Client.js b/js/test/Ice/exceptions/Client.js index 3673e14c484..b4b85ddfafa 100644 --- a/js/test/Ice/exceptions/Client.js +++ b/js/test/Ice/exceptions/Client.js @@ -475,11 +475,11 @@ let communicator; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.MessageSizeMax", "10"); properties.setProperty("Ice.Warn.Connections", "0"); properties.setProperty("Ice.PrintStackTraces", "1"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); await this.allTests(Test); } finally diff --git a/js/test/Ice/exceptions/Server.js b/js/test/Ice/exceptions/Server.js index 026774227e1..ee85f27d912 100644 --- a/js/test/Ice/exceptions/Server.js +++ b/js/test/Ice/exceptions/Server.js @@ -22,11 +22,11 @@ let echo; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.MessageSizeMax", "10"); properties.setProperty("Ice.Warn.Dispatch", "0"); properties.setProperty("Ice.Warn.Connections", "0"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint())); const adapter = await communicator.createObjectAdapter(""); diff --git a/js/test/Ice/exceptions/ServerAMD.js b/js/test/Ice/exceptions/ServerAMD.js index c70113f1fd7..952b50be20f 100644 --- a/js/test/Ice/exceptions/ServerAMD.js +++ b/js/test/Ice/exceptions/ServerAMD.js @@ -22,11 +22,11 @@ let echo; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.MessageSizeMax", "10"); properties.setProperty("Ice.Warn.Dispatch", "0"); properties.setProperty("Ice.Warn.Connections", "0"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint())); const adapter = await communicator.createObjectAdapter(""); adapter.add(new AMDThrowerI(), Ice.stringToIdentity("thrower")); diff --git a/js/test/Ice/facets/Client.js b/js/test/Ice/facets/Client.js index 9af9d5d4290..62a36d7258d 100644 --- a/js/test/Ice/facets/Client.js +++ b/js/test/Ice/facets/Client.js @@ -111,7 +111,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/facets/Server.js b/js/test/Ice/facets/Server.js index 5e5877f1527..81e01dc1e15 100644 --- a/js/test/Ice/facets/Server.js +++ b/js/test/Ice/facets/Server.js @@ -28,7 +28,7 @@ let echo; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); const out = this.getWriter(); echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint())); diff --git a/js/test/Ice/hold/Client.js b/js/test/Ice/hold/Client.js index 133fb333edb..07a02389cd7 100644 --- a/js/test/Ice/hold/Client.js +++ b/js/test/Ice/hold/Client.js @@ -258,7 +258,7 @@ let communicator; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); // // For this test, we want to disable retries. // @@ -269,7 +269,7 @@ // properties.setProperty("Ice.Warn.Connections", "0"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); await this.allTests(); } finally diff --git a/js/test/Ice/info/Client.js b/js/test/Ice/info/Client.js index c1da5777340..2b4a0a33d45 100644 --- a/js/test/Ice/info/Client.js +++ b/js/test/Ice/info/Client.js @@ -141,7 +141,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/inheritance/Client.js b/js/test/Ice/inheritance/Client.js index 9665a8f7bc7..2ac84214515 100644 --- a/js/test/Ice/inheritance/Client.js +++ b/js/test/Ice/inheritance/Client.js @@ -223,7 +223,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/inheritance/Server.js b/js/test/Ice/inheritance/Server.js index c74e388d445..a17f9190a37 100644 --- a/js/test/Ice/inheritance/Server.js +++ b/js/test/Ice/inheritance/Server.js @@ -22,7 +22,7 @@ let echo; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint())); const adapter = await communicator.createObjectAdapter(""); const base = communicator.stringToProxy("initial:" + this.getTestEndpoint()); diff --git a/js/test/Ice/location/Client.js b/js/test/Ice/location/Client.js index 7931ceccf8d..077bced868d 100644 --- a/js/test/Ice/location/Client.js +++ b/js/test/Ice/location/Client.js @@ -503,9 +503,9 @@ let communicator; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.Default.Locator", "locator:" + this.getTestEndpoint(properties)); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); await this.allTests(); } finally diff --git a/js/test/Ice/objects/Client.js b/js/test/Ice/objects/Client.js index 3303879e122..593824b8529 100644 --- a/js/test/Ice/objects/Client.js +++ b/js/test/Ice/objects/Client.js @@ -432,9 +432,9 @@ let communicator; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.Warn.Connections", "0"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); await this.allTests(); } finally diff --git a/js/test/Ice/objects/Server.js b/js/test/Ice/objects/Server.js index 16c6a5dbd75..89f601489d0 100644 --- a/js/test/Ice/objects/Server.js +++ b/js/test/Ice/objects/Server.js @@ -30,10 +30,10 @@ let echo; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.Warn.Dispatch", "0"); properties.setProperty("Ice.Warn.Connections", "0"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint())); const adapter = await communicator.createObjectAdapter(""); adapter.add(new InitialI(communicator), Ice.stringToIdentity("initial")); diff --git a/js/test/Ice/operations/Client.js b/js/test/Ice/operations/Client.js index dd9840d4e9c..65d955bfd1b 100644 --- a/js/test/Ice/operations/Client.js +++ b/js/test/Ice/operations/Client.js @@ -65,9 +65,9 @@ let communicator; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.BatchAutoFlushSize", "100"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); await this.allTests(Test, false); } finally diff --git a/js/test/Ice/operations/Server.js b/js/test/Ice/operations/Server.js index 86c4af3217e..d4d9c5eaeb2 100644 --- a/js/test/Ice/operations/Server.js +++ b/js/test/Ice/operations/Server.js @@ -22,9 +22,9 @@ let echo; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.BatchAutoFlushSize", "100"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint())); const adapter = await communicator.createObjectAdapter(""); adapter.add(new MyDerivedClassI(echo.ice_getEndpoints()), Ice.stringToIdentity("test")); diff --git a/js/test/Ice/operations/ServerAMD.js b/js/test/Ice/operations/ServerAMD.js index d16db6da5b5..9f738bf09b6 100644 --- a/js/test/Ice/operations/ServerAMD.js +++ b/js/test/Ice/operations/ServerAMD.js @@ -22,9 +22,9 @@ let echo; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.BatchAutoFlushSize", "100"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint())); const adapter = await communicator.createObjectAdapter(""); adapter.add(new AMDMyDerivedClassI(echo.ice_getEndpoints()), Ice.stringToIdentity("test")); diff --git a/js/test/Ice/optional/Client.js b/js/test/Ice/optional/Client.js index 90ac782f2d9..74eff0b5b28 100644 --- a/js/test/Ice/optional/Client.js +++ b/js/test/Ice/optional/Client.js @@ -793,7 +793,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(Test); } finally diff --git a/js/test/Ice/optional/Server.js b/js/test/Ice/optional/Server.js index c720ffdebe8..07bec470976 100644 --- a/js/test/Ice/optional/Server.js +++ b/js/test/Ice/optional/Server.js @@ -22,7 +22,7 @@ let echo; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint())); const adapter = await communicator.createObjectAdapter(""); adapter.add(new InitialI(), Ice.stringToIdentity("initial")); diff --git a/js/test/Ice/optional/ServerAMD.js b/js/test/Ice/optional/ServerAMD.js index 6892c387a76..399d757db41 100644 --- a/js/test/Ice/optional/ServerAMD.js +++ b/js/test/Ice/optional/ServerAMD.js @@ -22,7 +22,7 @@ let echo; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint())); const adapter = await communicator.createObjectAdapter(""); adapter.add(new AMDInitialI(), Ice.stringToIdentity("initial")); diff --git a/js/test/Ice/properties/Client.js b/js/test/Ice/properties/Client.js index b0faa9461c4..82db61c00da 100644 --- a/js/test/Ice/properties/Client.js +++ b/js/test/Ice/properties/Client.js @@ -95,7 +95,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator, args] = this.initialize(args); await this.allTests(args); } finally diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js index 188cc88333e..7e2d9d0249b 100644 --- a/js/test/Ice/proxy/Client.js +++ b/js/test/Ice/proxy/Client.js @@ -1157,7 +1157,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/retry/Client.js b/js/test/Ice/retry/Client.js index 046774a258a..77985661253 100644 --- a/js/test/Ice/retry/Client.js +++ b/js/test/Ice/retry/Client.js @@ -104,7 +104,7 @@ let communicator2; try { - let properties = this.createTestProperties(args); + let [properties] = this.createTestProperties(args); // // For this test, we want to disable retries. @@ -116,7 +116,7 @@ // properties.setProperty("Ice.Warn.Connections", "0"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); // // Configure a second communicator for the invocation timeout @@ -125,7 +125,7 @@ // properties = communicator.getProperties().clone(); properties.setProperty("Ice.RetryIntervals", "0 1 10000"); - communicator2 = this.initialize(properties); + [communicator2] = this.initialize(properties); await this.allTests(communicator, communicator2); } diff --git a/js/test/Ice/scope/Client.js b/js/test/Ice/scope/Client.js index 2cb6f8e69b8..097b6acc494 100644 --- a/js/test/Ice/scope/Client.js +++ b/js/test/Ice/scope/Client.js @@ -171,7 +171,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/servantLocator/Client.js b/js/test/Ice/servantLocator/Client.js index b91df3fd0da..ed6f30c3bc4 100644 --- a/js/test/Ice/servantLocator/Client.js +++ b/js/test/Ice/servantLocator/Client.js @@ -297,7 +297,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/servantLocator/Server.js b/js/test/Ice/servantLocator/Server.js index b7fca96235c..926f6acfdfa 100644 --- a/js/test/Ice/servantLocator/Server.js +++ b/js/test/Ice/servantLocator/Server.js @@ -24,11 +24,11 @@ let echo; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); properties.setProperty("Ice.MessageSizeMax", "10"); properties.setProperty("Ice.Warn.Dispatch", "0"); properties.setProperty("Ice.Warn.Connections", "0"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); echo = await Test.EchoPrx.checkedCast(communicator.stringToProxy("__echo:" + this.getTestEndpoint())); const adapter = await communicator.createObjectAdapter(""); diff --git a/js/test/Ice/slicing/exceptions/Client.js b/js/test/Ice/slicing/exceptions/Client.js index 28a07dd0908..14e298164f1 100644 --- a/js/test/Ice/slicing/exceptions/Client.js +++ b/js/test/Ice/slicing/exceptions/Client.js @@ -315,7 +315,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/slicing/objects/Client.js b/js/test/Ice/slicing/objects/Client.js index d60d27da3a4..97cb9b7a45f 100644 --- a/js/test/Ice/slicing/objects/Client.js +++ b/js/test/Ice/slicing/objects/Client.js @@ -772,7 +772,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(); } finally diff --git a/js/test/Ice/stream/Client.js b/js/test/Ice/stream/Client.js index eacfcc39e4b..8a59dd534e1 100644 --- a/js/test/Ice/stream/Client.js +++ b/js/test/Ice/stream/Client.js @@ -622,7 +622,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); this.allTests(); } finally diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js index 67f2687a2cb..3ec1a54d59c 100644 --- a/js/test/Ice/timeout/Client.js +++ b/js/test/Ice/timeout/Client.js @@ -354,7 +354,7 @@ let communicator; try { - const properties = this.createTestProperties(args); + const [properties] = this.createTestProperties(args); // // For this test, we want to disable retries. // @@ -366,7 +366,7 @@ properties.setProperty("Ice.Warn.Connections", "0"); properties.setProperty("Ice.PrintStackTraces", "1"); - communicator = this.initialize(properties); + [communicator] = this.initialize(properties); await this.allTests(); } finally diff --git a/js/test/Slice/escape/Client.js b/js/test/Slice/escape/Client.js index 0e2d14f998e..8a777396ea0 100644 --- a/js/test/Slice/escape/Client.js +++ b/js/test/Slice/escape/Client.js @@ -91,7 +91,7 @@ let communicator; try { - communicator = this.initialize(args); + [communicator] = this.initialize(args); await this.allTests(); } finally |