From 9d3ba81c6ddc52b4a47693a0dceb76f806e5d126 Mon Sep 17 00:00:00 2001
From: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Date: Fri, 13 Dec 2019 04:08:28 +0100
Subject: [PATCH] task/iscsi: use remote.sh instead of remote.run for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
---
 teuthology/task/iscsi.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/teuthology/task/iscsi.py b/teuthology/task/iscsi.py
index 8c27ae694..80d01cb8f 100644
--- a/teuthology/task/iscsi.py
+++ b/teuthology/task/iscsi.py
@@ -5,7 +5,6 @@ import logging
 import contextlib
 import socket
 
-from cStringIO import StringIO
 from teuthology import misc as teuthology
 from teuthology import contextutil
 from teuthology.task.common_fs_utils import generic_mkfs
@@ -66,8 +65,7 @@ def file_io_test(rem, file_from, lnkpath):
         'bs=1024',
         'conv=fsync',
     ])
-    proc = rem.run(args=['mktemp'], stdout=StringIO(),)
-    tfile2 = proc.stdout.getvalue().strip()
+    tfile2 = rem.sh('mktemp').strip()
     rem.run(
         args=[
         'sudo',
@@ -78,17 +76,15 @@ def file_io_test(rem, file_from, lnkpath):
         run.Raw('>'),
         tfile2,
     ])
-    proc = rem.run(
-        args=[
+    size = rem.sh(
+        [
             'ls',
             '-l',
             file_from,
             run.Raw('|'),
             'awk',
             '{print $5}', ],
-        stdout=StringIO(),
-        )
-    size = proc.stdout.getvalue().strip()
+        ).strip()
     rem.run(
         args=[
             'cmp',
@@ -112,8 +108,7 @@ def general_io_test(ctx, rem, image_name):
     ])
     test_phrase = 'The time has come the walrus said to speak of many things.'
     lnkpath = tgt_devname_get(ctx, image_name)
-    proc = rem.run(args=['mktemp'], stdout=StringIO(),)
-    tfile1 = proc.stdout.getvalue().strip()
+    tfile1 = rem.sh('mktemp').strip()
     rem.run(
         args=[
             'echo',
-- 
2.47.3