]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
task/internal/syslog: use remote.sh for py3 compat
authorKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Fri, 13 Dec 2019 03:11:47 +0000 (04:11 +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/syslog.py

index 8908b4c184ddd02c911755375779ee13ee58ef38..b073c9f78c6ba6efe2f3bf49b87f5c2dd51626a0 100644 (file)
@@ -1,7 +1,7 @@
 import contextlib
 import logging
 
-from cStringIO import StringIO
+from io import BytesIO
 
 from teuthology import misc
 from teuthology.job_status import set_status
@@ -41,7 +41,7 @@ def syslog(ctx, config):
         '*.*;kern.none -{misc_log};RSYSLOG_FileFormat'.format(
             misc_log=misc_log),
     ]
-    conf_fp = StringIO('\n'.join(conf_lines))
+    conf_fp = BytesIO('\n'.join(conf_lines).encode())
     try:
         for rem in ctx.cluster.remotes.keys():
             log_context = 'system_u:object_r:var_log_t:s0'
@@ -95,8 +95,8 @@ def syslog(ctx, config):
         log.info('Checking logs for errors...')
         for rem in ctx.cluster.remotes.keys():
             log.debug('Checking %s', rem.name)
-            r = rem.run(
-                args=[
+            stdout = rem.sh(
+                [
                     'egrep', '--binary-files=text',
                     '\\bBUG\\b|\\bINFO\\b|\\bDEADLOCK\\b',
                     run.Raw('{adir}/syslog/*.log'.format(adir=archive_dir)),
@@ -142,9 +142,7 @@ def syslog(ctx, config):
                     run.Raw('|'),
                     'head', '-n', '1',
                 ],
-                stdout=StringIO(),
             )
-            stdout = r.stdout.getvalue()
             if stdout != '':
                 log.error('Error in syslog on %s: %s', rem.name, stdout)
                 set_status(ctx.summary, 'fail')