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 83e1337a79e0efb884b157aa8a6fed644db1c7e8..24f85627e96f553b63d13299da93da027d78f5ab 100644 (file)
--- 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