import ceph 16.2.6

[ceph.git] / ceph / qa / workunits / mon / test_mon_config_key.py

diff --git a/ceph/qa/workunits/mon/test_mon_config_key.py b/ceph/qa/workunits/mon/test_mon_config_key.py
index bcc1a79dd35198fab91885ec83c5cec1a527ce5c..0d8ec1c27d9a217093bdc99043bf5bdf06b1af42 100755 (executable)
--- a/ceph/qa/workunits/mon/test_mon_config_key.py
+++ b/ceph/qa/workunits/mon/test_mon_config_key.py
@@ -78,39 +78,19 @@ def run_cmd(cmd, expects=0):
     cmdlog = LOG.getChild('run_cmd')
     cmdlog.debug('{fc}'.format(fc=' '.join(full_cmd)))
 
-    proc = subprocess.Popen(full_cmd,
-                            stdout=subprocess.PIPE,
-                            stderr=subprocess.PIPE)
-
-    stdout = []
-    stderr = []
-    while True:
-        try:
-            out, err = proc.communicate()
-            if out is not None:
-                stdout += out.decode().split('\n')
-                cmdlog.debug('stdout: {s}'.format(s=out))
-            if err is not None:
-                stdout += err.decode().split('\n')
-                cmdlog.debug('stderr: {s}'.format(s=err))
-        except ValueError:
-            ret = proc.wait()
-            break
-
-    if ret != expects:
-        cmdlog.error('cmd > {cmd}'.format(cmd=full_cmd))
-        cmdlog.error("expected return '{expected}' got '{got}'".format(
-            expected=expects, got=ret))
+    proc = subprocess.run(full_cmd,
+                          stdout=subprocess.PIPE,
+                          stderr=subprocess.PIPE,
+                          universal_newlines=True)
+    if proc.returncode != expects:
+        cmdlog.error(f'cmd > {proc.args}')
+        cmdlog.error(f'expected return "{expects}" got "{proc.returncode}"')
         cmdlog.error('stdout')
-        for i in stdout:
-            cmdlog.error('{x}'.format(x=i))
+        cmdlog.error(proc.stdout)
         cmdlog.error('stderr')
-        for i in stderr:
-            cmdlog.error('{x}'.format(x=i))
+        cmdlog.error(proc.stderr)
 
 
-# end run_cmd
-
 def gen_data(size, rnd):
     chars = string.ascii_letters + string.digits
     return ''.join(rnd.choice(chars) for _ in range(size))