X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FSetupFramework.py;h=7e3b36cc77a8acbe5d136b6e20e14057a935cd05;hp=6df6f0dbd5afd6f271d658e43dd4edfd61c3054a;hb=533ce0def99dc776f5a2b9075aaabea000c2dc89;hpb=500dba02e62ba24f94972a0ef8f023418a7eee09 diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py index 6df6f0dbd5..7e3b36cc77 100644 --- a/resources/libraries/python/SetupFramework.py +++ b/resources/libraries/python/SetupFramework.py @@ -17,6 +17,7 @@ supposed to end up here. """ from os import environ, remove +import socket # For catching socket.timeout. from tempfile import NamedTemporaryFile import threading @@ -158,7 +159,7 @@ def setup_node(node, tarball, remote_tarball, results=None): extract_tarball_at_node(remote_tarball, node) if node[u"type"] == NodeType.TG: create_env_directory_at_node(node) - except RuntimeError as exc: + except (RuntimeError, socket.timeout) as exc: logger.console( f"Node {node[u'type']} host {node[u'host']}, port {node[u'port']} " f"setup failed, error: {exc!r}" @@ -271,7 +272,7 @@ class SetupFramework: threads.append(thread) logger.info( - f"Executing node setups in parallel, waiting for threads to end" + u"Executing node setups in parallel, waiting for threads to end." ) for thread in threads: