From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Fri, 21 Feb 2020 21:17:09 +0000 (+0100)
Subject: qa/tasks/reg11184: get rid of cStringIO for py3
X-Git-Tag: v15.1.1~129^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fa16954df94a763d2604f58c119b8ee943fa2cfe;p=ceph.git

qa/tasks/reg11184: get rid of cStringIO for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
---

diff --git a/qa/tasks/reg11184.py b/qa/tasks/reg11184.py
index 3a1daa0a38501..1059fda712539 100644
--- a/qa/tasks/reg11184.py
+++ b/qa/tasks/reg11184.py
@@ -8,8 +8,8 @@ divergent priors.
 """
 import logging
 import time
-from cStringIO import StringIO
 
+from teuthology.exceptions import CommandFailedError
 from teuthology.orchestra import run
 from teuthology import misc as teuthology
 from util.rados import rados
@@ -176,9 +176,10 @@ def task(ctx, config):
     expfile = os.path.join(testdir, "exp.{pid}.out".format(pid=pid))
     cmd = ((prefix + "--op export-remove --pgid 2.0 --file {file}").
            format(id=divergent, file=expfile))
-    proc = exp_remote.run(args=cmd, wait=True,
-                          check_status=False, stdout=StringIO())
-    assert proc.exitstatus == 0
+    try:
+        exp_remote.sh(cmd, wait=True)
+    except CommandFailedError as e:
+        assert e.exitstatus == 0
 
     # Kill one of non-divergent OSDs
     log.info('killing osd.%d' % non_divergent[0])
@@ -189,14 +190,14 @@ def task(ctx, config):
     # An empty collection for pg 2.0 might need to be cleaned up
     cmd = ((prefix + "--force --op remove --pgid 2.0").
            format(id=non_divergent[0]))
-    proc = exp_remote.run(args=cmd, wait=True,
-                          check_status=False, stdout=StringIO())
+    exp_remote.sh(cmd, wait=True, check_status=False)
 
     cmd = ((prefix + "--op import --file {file}").
            format(id=non_divergent[0], file=expfile))
-    proc = exp_remote.run(args=cmd, wait=True,
-                          check_status=False, stdout=StringIO())
-    assert proc.exitstatus == 0
+    try:
+        exp_remote.sh(cmd, wait=True)
+    except CommandFailedError as e:
+        assert e.exitstatus == 0
 
     # bring in our divergent friend and other node
     log.info("revive divergent %d", divergent)