Improve test tag string parsing

[csit.git] / resources / libraries / python / DUTSetup.py

diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index bd6bb46..9ae06c1 100644 (file)
--- a/resources/libraries/python/DUTSetup.py
+++ b/resources/libraries/python/DUTSetup.py
@@ -33,8 +33,7 @@ class DUTSetup(object):
         :type service: str
         """
         if DUTSetup.running_in_container(node):
-            command = ('echo $(< /var/log/supervisord.log);'
-                       'echo $(< /tmp/*supervisor*.log)')
+            command = ('echo $(< /tmp/*supervisor*.log)')
         else:
             command = ('journalctl --no-pager --unit={name} '
                        '--since="$(echo `systemctl show -p '
@@ -77,7 +76,7 @@ class DUTSetup(object):
             format(host=node['host'], name=service)
 
         exec_cmd_no_error(
-            node, command, timeout=120, sudo=True, message=message)
+            node, command, timeout=180, sudo=True, message=message)
 
         DUTSetup.get_service_logs(node, service)
 
@@ -112,7 +111,7 @@ class DUTSetup(object):
             format(host=node['host'], name=service)
 
         exec_cmd_no_error(
-            node, command, timeout=120, sudo=True, message=message)
+            node, command, timeout=180, sudo=True, message=message)
 
         DUTSetup.get_service_logs(node, service)
 
@@ -145,7 +144,8 @@ class DUTSetup(object):
         message = 'Node {host} failed to stop service {name}'.\
             format(host=node['host'], name=service)
 
-        exec_cmd_no_error(node, command, timeout=30, sudo=True, message=message)
+        exec_cmd_no_error(
+            node, command, timeout=180, sudo=True, message=message)
 
         DUTSetup.get_service_logs(node, service)