From 1265811648221dd41342e98925e7a31a0442f8f9 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Fri, 13 Dec 2019 02:34:28 +0100 Subject: [PATCH] task/internal/vm_setup: get rid of cString import for py3 Signed-off-by: Kyr Shatskyy --- teuthology/task/internal/vm_setup.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/teuthology/task/internal/vm_setup.py b/teuthology/task/internal/vm_setup.py index 828eff1843..f210bc7f41 100644 --- a/teuthology/task/internal/vm_setup.py +++ b/teuthology/task/internal/vm_setup.py @@ -2,10 +2,9 @@ import logging import os import subprocess -from cStringIO import StringIO - from teuthology.parallel import parallel from teuthology.task import ansible +from teuthology.exceptions import CommandFailedError log = logging.getLogger(__name__) @@ -24,9 +23,9 @@ def vm_setup(ctx, config): for rem in ctx.cluster.remotes.keys(): if rem.is_vm: ansible_hosts.add(rem.shortname) - r = rem.run(args=['test', '-e', '/ceph-qa-ready'], - stdout=StringIO(), check_status=False) - if r.returncode != 0: + try: + rem.sh('test -e /ceph-qa-ready') + except CommandFailedError: p1 = subprocess.Popen(['cat', editinfo], stdout=subprocess.PIPE) p2 = subprocess.Popen( -- 2.39.5