"Fix runtestmanager for CICD deployments Q3"
This reverts commit 6d52a45a5b11e015d7beac3ee97f2e1bc486e17e.
Change-Id: I4df498b841a44eda1bc840464fea8e371980e62e
diff --git a/tcp_tests/managers/saltmanager.py b/tcp_tests/managers/saltmanager.py
index b5d5f04..6fad0e4 100644
--- a/tcp_tests/managers/saltmanager.py
+++ b/tcp_tests/managers/saltmanager.py
@@ -104,11 +104,12 @@
self.__session_start = login()
return self.__api
- def local(self, tgt, fun, args=None, kwargs=None):
- return self.api.local(tgt, fun, args, kwargs, expr_form='compound')
+ def local(self, tgt, fun, args=None, kwargs=None, timeout=None):
+ return self.api.local(tgt, fun, args, kwargs, timeout=timeout,
+ expr_form='compound')
- def local_async(self, tgt, fun, args=None, kwargs=None):
- return self.api.local_async(tgt, fun, args, kwargs)
+ def local_async(self, tgt, fun, args=None, kwargs=None, timeout=None):
+ return self.api.local_async(tgt, fun, args, kwargs, timeout=timeout)
def lookup_result(self, jid):
return self.api.lookup_jid(jid)
@@ -138,25 +139,27 @@
return fails if fails else None
- def enforce_state(self, tgt, state, args=None, kwargs=None):
- r = self.local(tgt=tgt, fun='state.sls', args=state)
+ def enforce_state(self, tgt, state, args=None, kwargs=None, timeout=None):
+ r = self.local(tgt=tgt, fun='state.sls', args=state, timeout=timeout)
f = self.check_result(r)
return r, f
- def enforce_states(self, tgt, state, args=None, kwargs=None):
+ def enforce_states(self, tgt, state, args=None, kwargs=None, timeout=None):
rets = []
for s in state:
- r = self.enforce_state(tgt=tgt, state=s)
+ r = self.enforce_state(tgt=tgt, state=s, timeout=timeout)
rets.append(r)
return rets
- def run_state(self, tgt, state, args=None, kwargs=None):
- return self.local(tgt=tgt, fun=state, args=args, kwargs=kwargs), None
+ def run_state(self, tgt, state, args=None, kwargs=None, timeout=None):
+ return self.local(tgt=tgt, fun=state, args=args, kwargs=kwargs,
+ timeout=timeout), None
- def run_states(self, tgt, state, args=None, kwargs=None):
+ def run_states(self, tgt, state, args=None, kwargs=None, timeout=None):
rets = []
for s in state:
- r = self.run_state(tgt=tgt, state=s, args=args, kwargs=kwargs)
+ r = self.run_state(tgt=tgt, state=s, args=args, kwargs=kwargs,
+ timeout=timeout)
rets.append(r)
return rets