diff options
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 6d32df7a0ec..a324c538263 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -398,8 +398,10 @@ class Windows(Platform): self.compiler = "v120" elif out.find("Version 19.00.") != -1: self.compiler = "v140" - elif out.find("Version 19.") != -1: + elif out.find("Version 19.1") != -1: self.compiler = "v141" + elif out.find("Version 19.2") != -1: + self.compiler = "v142" else: raise RuntimeError("Unknown compiler version:\n{0}".format(out)) except: @@ -2672,13 +2674,20 @@ class BrowserProcessController(RemoteProcessController): self.host) if url != self.url: self.url = url + ident = current.driver.getCommunicator().stringToIdentity("Browser/ProcessController") if self.driver: + # Clear the previous controller connection if it exists. This ensures that the reload + # of the test controller will use a new connection (with Chrome the connection close + # callback for the old page is sometime called after the new paged is loaded). + with self.cond: + if ident in self.processControllerProxies: + prx = self.processControllerProxies[ident] + self.clearProcessController(prx, prx.ice_getCachedConnection()) self.driver.get(url) else: # If no process controller is registered, we request the user to load the controller # page in the browser. Once loaded, the controller will register and we'll redirect to # the correct testsuite page. - ident = current.driver.getCommunicator().stringToIdentity("Browser/ProcessController") prx = None with self.cond: while True: @@ -3212,7 +3221,9 @@ class JavaMapping(Mapping): "IceSSL.Keystore": "server.bks" if isinstance(process, Server) else "client.bks" }) else: + # WORKAROUND JDK 11 sporadic connection failures with OpenSSL TLS 1.3 enabled server props.update({ + "IceSSL.Protocols": "TLS1_2", "IceSSL.Keystore": "server.jks" if isinstance(process, Server) else "client.jks", }) return props |