diff options
| author | Jose <jose@zeroc.com> | 2019-04-08 21:53:55 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-04-08 21:53:55 +0200 |
| commit | b71550bbaf6ca1935b6f16630b04f601c77e7d3b (patch) | |
| tree | 918677175b4534eaf741049e7179bda29fe398fa /scripts/Util.py | |
| parent | Fix for ice_ids (diff) | |
| download | ice-b71550bbaf6ca1935b6f16630b04f601c77e7d3b.tar.bz2 ice-b71550bbaf6ca1935b6f16630b04f601c77e7d3b.tar.xz ice-b71550bbaf6ca1935b6f16630b04f601c77e7d3b.zip | |
Test controller fixes
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index db28bd7d40f..f333ac1fb22 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2078,8 +2078,11 @@ class RemoteProcessController(ProcessController): import Ice try: result = self.proxy.waitSuccess(timeout) - except Ice.UserException: - raise Expect.TIMEOUT("waitSuccess timeout") + except Ice.UserException as ex: + if "Timeout" in ex.reason: + raise Expect.TIMEOUT("waitSuccess timeout") + else: + raise except Ice.LocalException: raise if exitstatus != result: @@ -2977,8 +2980,8 @@ class Driver: initData.properties.setProperty("IceDiscovery.Interface", self.interface) initData.properties.setProperty("Ice.Default.Host", self.interface) initData.properties.setProperty("Ice.ThreadPool.Server.Size", "10") - initData.properties.setProperty("Ice.Trace.Protocol", "1") - initData.properties.setProperty("Ice.Trace.Network", "3") + # initData.properties.setProperty("Ice.Trace.Protocol", "1") + # initData.properties.setProperty("Ice.Trace.Network", "3") # initData.properties.setProperty("Ice.StdErr", "allTests.log") initData.properties.setProperty("Ice.Override.Timeout", "10000") initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000") |