From e2b14de609490f96515053eadcd282bb23edc70b Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Fri, 21 Feb 2020 22:28:56 +0100 Subject: [PATCH] qa/tasks/divergent_priors2: get rid of cStringIO for py3 Signed-off-by: Kyr Shatskyy (cherry picked from commit b6eefbb02896043333f264023274e83ec36b8362) --- qa/tasks/divergent_priors2.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/qa/tasks/divergent_priors2.py b/qa/tasks/divergent_priors2.py index fa2fae9e7dc32..49bc8e469252d 100644 --- 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) -- 2.39.5