From: Warren Usui <warren.usui@inktank.com>
Date: Thu, 18 Sep 2014 20:29:18 +0000 (-0700)
Subject: Handle list-json downburst failure.
X-Git-Tag: 1.1.0~1155^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e37afbb65b77266f06dc96757bdbd404da8d173a;p=teuthology.git

Handle list-json downburst failure.

Use check_output instead of Popen and communicate()
Fixes: #9519
Signed-off-by: Warren Usui <warren.usui@inktank.com>
---

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 83e1337a7..24f85627e 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -51,12 +51,10 @@ def get_distro_from_downburst():
         log.info('Using default values for supported os_type/os_version')
         return default_table
     try:
-        p = subprocess.Popen([executable_cmd, 'list-json'],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE,)
-        output, err = p.communicate()
+        output = subprocess.check_output([executable_cmd, 'list-json'])
         downburst_data = json.loads(output)
         return downburst_data
-    except OSError:
+    except (subprocess.CalledProcessError, OSError):
         log.info('Using default values for supported os_type/os_version')
         return default_table