diff options
| -rw-r--r-- | cpp/test/Ice/timeout/AllTests.cpp | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/timeout/AllTests.cs | 2 | ||||
| -rw-r--r-- | js/test/Ice/timeout/Client.js | 2 | ||||
| -rw-r--r-- | matlab/test/Ice/timeout/AllTests.m | 2 | ||||
| -rw-r--r-- | php/test/Ice/timeout/Client.php | 2 | ||||
| -rw-r--r-- | python/test/Ice/timeout/AllTests.py | 2 | ||||
| -rw-r--r-- | ruby/test/Ice/timeout/AllTests.rb | 2 | ||||
| -rw-r--r-- | scripts/Util.py | 14 |
8 files changed, 14 insertions, 14 deletions
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index 2b5b73b858d..50d279460c6 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -147,7 +147,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // // Expect success. // - TimeoutPrxPtr to = ICE_UNCHECKED_CAST(TimeoutPrx, obj->ice_timeout(2000)); + TimeoutPrxPtr to = ICE_UNCHECKED_CAST(TimeoutPrx, obj->ice_timeout(-1)); controller->holdAdapter(100); try { diff --git a/csharp/test/Ice/timeout/AllTests.cs b/csharp/test/Ice/timeout/AllTests.cs index 4e83cd750fd..618408a94e6 100644 --- a/csharp/test/Ice/timeout/AllTests.cs +++ b/csharp/test/Ice/timeout/AllTests.cs @@ -101,7 +101,7 @@ public class AllTests : TestCommon.AllTests // // Expect success. // - Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(2000)); + Test.TimeoutPrx to = Test.TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(-1)); controller.holdAdapter(100); try { diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js index 3a05c085107..dfb71b734f9 100644 --- a/js/test/Ice/timeout/Client.js +++ b/js/test/Ice/timeout/Client.js @@ -82,7 +82,7 @@ } { - const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(2000 * mult)); + const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(-1)); await controller.holdAdapter(100 * mult); await to.ice_getConnection(); try diff --git a/matlab/test/Ice/timeout/AllTests.m b/matlab/test/Ice/timeout/AllTests.m index 10acb3d746c..0e68469f866 100644 --- a/matlab/test/Ice/timeout/AllTests.m +++ b/matlab/test/Ice/timeout/AllTests.m @@ -63,7 +63,7 @@ classdef AllTests % % Expect success. % - to = timeout.ice_timeout(2000); + to = timeout.ice_timeout(-1); controller.holdAdapter(100); try to.op(); diff --git a/php/test/Ice/timeout/Client.php b/php/test/Ice/timeout/Client.php index b6940f218bb..4cebf99db43 100644 --- a/php/test/Ice/timeout/Client.php +++ b/php/test/Ice/timeout/Client.php @@ -109,7 +109,7 @@ function allTests($communicator) // // Expect success. // - $to =$timeout->ice_timeout(2000); + $to = $timeout->ice_timeout(-1); $controller->holdAdapter(100); try { diff --git a/python/test/Ice/timeout/AllTests.py b/python/test/Ice/timeout/AllTests.py index 72dce48a044..b142769e5ab 100644 --- a/python/test/Ice/timeout/AllTests.py +++ b/python/test/Ice/timeout/AllTests.py @@ -89,7 +89,7 @@ def allTests(communicator): # # Expect success. # - to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(2000)) + to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(-1)) controller.holdAdapter(100) try: to.op() diff --git a/ruby/test/Ice/timeout/AllTests.rb b/ruby/test/Ice/timeout/AllTests.rb index 12204aa858c..47a388154fb 100644 --- a/ruby/test/Ice/timeout/AllTests.rb +++ b/ruby/test/Ice/timeout/AllTests.rb @@ -51,7 +51,7 @@ def allTests(communicator) # # Expect success. # - to = Test::TimeoutPrx::uncheckedCast(obj.ice_timeout(2000)) + to = Test::TimeoutPrx::uncheckedCast(obj.ice_timeout(-1)) controller.holdAdapter(100) begin to.op() diff --git a/scripts/Util.py b/scripts/Util.py index ed04d454452..e481f1ac1fe 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -66,7 +66,7 @@ def escapeXml(s, attribute=False): Component abstract class. The driver and mapping classes rely on the component class to provide component specific information. """ -class Component: +class Component(object): def __init__(self): pass @@ -160,7 +160,7 @@ class Component: else: return toplevel -class Platform: +class Platform(object): def __init__(self): self.parseBuildVariables({ @@ -467,11 +467,11 @@ Mapping abstract class. The mapping class provides mapping specific information. Multiple components can share the same mapping rules as long as the layout is similar. """ -class Mapping: +class Mapping(object): mappings = OrderedDict() - class Config: + class Config(object): @classmethod def getSupportedArgs(self): @@ -962,7 +962,7 @@ class Mapping: # A Runnable can be used as a "client" for in test cases, it provides # implements run, setup and teardown methods. # -class Runnable: +class Runnable(object): def __init__(self, desc=None): self.desc = desc @@ -1758,7 +1758,7 @@ class Result: out.write( '</testsuite>\n') -class TestSuite: +class TestSuite(object): def __init__(self, path, testcases=None, options=None, libDirs=None, runOnMainThread=False, chdir=False, multihost=True, mapping=None): @@ -3085,7 +3085,7 @@ class AndroidMappingMixin(): self.baseclass = baseclass def getSSLProps(self, process, current): - props = super(self.baseclass, self).getSSLProps(self, process, current) + props = super(self.baseclass, self).getSSLProps(process, current) props.update({ "IceSSL.KeystoreType" : "BKS", "IceSSL.TruststoreType" : "BKS", |