]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/vstart_runner: filter out non-ASCII chars 34805/head
authorRishabh Dave <ridave@redhat.com>
Tue, 14 Jan 2020 15:13:31 +0000 (20:43 +0530)
committerNathan Cutler <ncutler@suse.com>
Tue, 28 Apr 2020 17:45:02 +0000 (19:45 +0200)
...from stdout and stderr of a command issued using LocalRemoteProcess.

Fixes: https://tracker.ceph.com/issues/43567
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 43a0b64596d9f6cb91d9939745abf26da4481007)

qa/tasks/vstart_runner.py

index 7055ebb7c9d8d71fe8eb5285704932e584e9c97b..b9aac62df870ad942b575746a420eaa1769acf8e 100644 (file)
@@ -150,6 +150,11 @@ else:
     SRC_PREFIX = "./"
 
 
+def rm_nonascii_chars(var):
+    var = var.replace('\xe2\x80\x98', '\'')
+    var = var.replace('\xe2\x80\x99', '\'')
+    return var
+
 class LocalRemoteProcess(object):
     def __init__(self, args, subproc, check_status, stdout, stderr):
         self.args = args
@@ -170,6 +175,7 @@ class LocalRemoteProcess(object):
                 return
 
         out, err = self.subproc.communicate()
+        out, err = rm_nonascii_chars(out), rm_nonascii_chars(err)
         self.stdout.write(out)
         self.stderr.write(err)