From: Rishabh Dave <ridave@redhat.com>
Date: Sat, 17 Aug 2019 06:40:08 +0000 (+0530)
Subject: qa/vstart_runner.py: add timeout for vstart.sh and stop.sh
X-Git-Tag: v15.1.0~1410^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=842b5590aaeabddda61753a679a6f9474e4f1edd;p=ceph.git

qa/vstart_runner.py: add timeout for vstart.sh and stop.sh

Override default timeout for execution of vstart.sh and stop.sh since
neither scripts take more than 100 seconds normally.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index b2979e43d6a..63f37bd7d20 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -989,7 +989,7 @@ class LocalContext(object):
 
 def _teardown_cluster():
     log.info('\ntearing down the cluster...')
-    remote.run(args = [os.path.join(SRC_PREFIX, "stop.sh")])
+    remote.run(args = [os.path.join(SRC_PREFIX, "stop.sh")], timeout=60)
     remote.run(args = ['rm', '-rf', './dev', './out'])
 
 def exec_test():
@@ -1060,7 +1060,9 @@ def exec_test():
         if require_memstore:
             args.append("--memstore")
 
-        remote.run(args, env=vstart_env)
+        # usually, i get vstart.sh running completely in less than 100
+        # seconds.
+        remote.run(args, env=vstart_env, timeout=(3 * 60))
 
         # Wait for OSD to come up so that subsequent injectargs etc will
         # definitely succeed