]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
task/internal/vm_setup: get rid of cString import for py3
authorKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Fri, 13 Dec 2019 01:34:28 +0000 (02:34 +0100)
committerKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Fri, 13 Dec 2019 16:49:38 +0000 (17:49 +0100)
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
teuthology/task/internal/vm_setup.py

index 828eff184378d50508e4804d45ac5c487c23ad5f..f210bc7f41636595be4f106554490271b42aa4b3 100644 (file)
@@ -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(