summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-07-28 00:51:15 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-07-28 00:51:15 +0200
commit83961346e79e291e96a7178d81a74e117aefd76f (patch)
tree903757cb1737e3c6668137711696009ac1661551
parent9e959bea4ee2b11f9a89cb10ecc3e6b8164b6ed3 (diff)
Remove former timeout -t args
It completes the update to Alpine 3.10. Change-Id: I81793d4d17667b9bbab4b8659ebf90e1f79f3b5e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/opnfv_tests/vnf/epc/juju_epc.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 5a0a86b..b2dbabd 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -238,7 +238,7 @@ class JujuEpc(singlevm.VmReady2):
self.flavor_alt = self.create_flavor_alt()
self.__logger.info("Starting Juju Bootstrap process...")
try:
- cmd = ['timeout', '-t', JujuEpc.juju_timeout,
+ cmd = ['timeout', JujuEpc.juju_timeout,
'juju', 'bootstrap',
'abot-epc/{}'.format(
self.cloud.region_name if self.cloud.region_name else (
@@ -296,7 +296,7 @@ class JujuEpc(singlevm.VmReady2):
self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
self.__logger.info("Waiting for instances .....")
try:
- cmd = ['timeout', '-t', JujuEpc.juju_timeout, 'juju-wait']
+ cmd = ['timeout', JujuEpc.juju_timeout, 'juju-wait']
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
self.__logger.info("Deployed Abot-epc on Openstack")
@@ -318,14 +318,14 @@ class JujuEpc(singlevm.VmReady2):
return False
self.__logger.info("Transferring the feature files to Abot_node ...")
- cmd = ['timeout', '-t', JujuEpc.juju_timeout,
+ cmd = ['timeout', JujuEpc.juju_timeout,
'juju', 'scp', '--', '-r', '-v',
'{}/featureFiles'.format(self.case_dir), 'abot-epc-basic/0:~/']
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
self.__logger.info("Copying the feature files within Abot_node ")
- cmd = ['timeout', '-t', JujuEpc.juju_timeout,
+ cmd = ['timeout', JujuEpc.juju_timeout,
'juju', 'ssh', 'abot-epc-basic/0',
'sudo', 'cp', '-vfR', '~/featureFiles/*',
'/etc/rebaca-test-suite/featureFiles']
@@ -342,13 +342,13 @@ class JujuEpc(singlevm.VmReady2):
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
- cmd = ['timeout', '-t', JujuEpc.juju_timeout, 'juju-wait']
+ cmd = ['timeout', JujuEpc.juju_timeout, 'juju-wait']
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
duration = time.time() - start_time
self.__logger.info("Getting results from Abot node....")
- cmd = ['timeout', '-t', JujuEpc.juju_timeout,
+ cmd = ['timeout', JujuEpc.juju_timeout,
'juju', 'scp', '--', '-v',
'abot-epc-basic/0:'
'/var/lib/abot-epc-basic/artifacts/TestResults.json',
@@ -396,7 +396,7 @@ class JujuEpc(singlevm.VmReady2):
self.__logger.debug(
"%s\n%s", " ".join(cmd), output.decode("utf-8"))
self.__logger.info("Destroying Orchestrator...")
- cmd = ['timeout', '-t', JujuEpc.juju_timeout,
+ cmd = ['timeout', JujuEpc.juju_timeout,
'juju', 'destroy-controller', '-y', 'abot-controller',
'--destroy-all-models']
output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)