commit b6bcc5cc0b76cb7c3562e0f7d064d2084e27ce2d
author Dennis Dmitriev <dis.xcom@gmail.com> Wed Sep 26 11:07:53 2018 +0000
committer Dennis Dmitriev <dis.xcom@gmail.com> Wed Oct 03 16:26:06 2018 +0000
tree 3a414b0f15018849095b5c12b2be107a145748a8
parent 4077242cb6788d543a28f57a7564170aa16e34e7

"Fix runtestmanager for CICD deployments Q3"

This reverts commit 6d52a45a5b11e015d7beac3ee97f2e1bc486e17e.

Change-Id: I4df498b841a44eda1bc840464fea8e371980e62e

tcp_tests/managers/execute_commands.py

diff --git a/tcp_tests/managers/execute_commands.py b/tcp_tests/managers/execute_commands.py
index adb76dc..193153c 100644
--- a/tcp_tests/managers/execute_commands.py
+++ b/tcp_tests/managers/execute_commands.py
@@ -87,6 +87,7 @@
         retry_count = retry.get('count', 1)
         retry_delay = retry.get('delay', 1)
         skip_fail = step.get('skip_fail', False)
+        timeout = step.get('timeout', None)
 
         with self.__underlay.remote(node_name=node_name) as remote:
 
@@ -101,7 +102,7 @@
                 LOG.info("\n\n{0}\n{1}".format(
                     msg + retry_msg, '=' * len(msg + retry_msg)))
 
-                result = remote.execute(cmd, verbose=True)
+                result = remote.execute(cmd, timeout=timeout, verbose=True)
                 if return_res:
                     return result
 
@@ -148,6 +149,7 @@
         retry_count = retry.get('count', 1)
         retry_delay = retry.get('delay', 1)
         skip_fail = step.get('skip_fail', False)
+        timeout = step.get('timeout', None)
 
         if not bool(state) ^ bool(states):
             raise ValueError("You should use state or states in step")
@@ -165,7 +167,7 @@
 
             method = getattr(self._salt, self._salt._map[do])
             command_ret = method(tgt=target, state=state or states,
-                                 args=args, kwargs=kwargs)
+                                 args=args, kwargs=kwargs, timeout=timeout)
             command_ret = command_ret if \
                 isinstance(command_ret, list) else [command_ret]
             results = [(r['return'][0], f) for r, f in command_ret]