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

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit b6eefbb02896043333f264023274e83ec36b8362)

diff --git a/qa/tasks/divergent_priors2.py b/qa/tasks/divergent_priors2.py
index fa2fae9e7dc3244dc1c6a96d305ac98813ca5c6e..49bc8e469252df968d5a9275b10c7aa5e6087033 100644 (file)
--- a/qa/tasks/divergent_priors2.py
+++ b/qa/tasks/divergent_priors2.py
@@ -3,8 +3,8 @@ Special case divergence test with ceph-objectstore-tool export/remove/import
 """
 import logging
 import time
-from cStringIO import StringIO
 
+from teuthology.exceptions import CommandFailedError
 from teuthology import misc as teuthology
 from util.rados import rados
 import os
@@ -158,15 +158,17 @@ 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
 
     cmd = ((prefix + "--op import --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
 
     log.info("reviving divergent %d", divergent)
     manager.revive_osd(divergent)