[KVM-AUTOTEST PATCH 17/18] KVM test: kvm_subprocess.py: don't sanitize text before passing it to callbacks

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Converting the text to utf-8 seems to cause trouble when converting back (e.g.
when writing to files).  The logging system seems to be fine with unsanitized
text, so let's not sanitize it.

Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx>
---
 client/tests/kvm/kvm_subprocess.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/tests/kvm/kvm_subprocess.py b/client/tests/kvm/kvm_subprocess.py
index 73edc5d..93a8429 100755
--- a/client/tests/kvm/kvm_subprocess.py
+++ b/client/tests/kvm/kvm_subprocess.py
@@ -688,9 +688,7 @@ class kvm_tail(kvm_spawn):
         def print_line(text):
             # Pre-pend prefix and remove trailing whitespace
             text = self.output_prefix + text.rstrip()
-            # Sanitize text
-            text = text.decode("utf-8", "replace")
-            # Pass it to output_func
+            # Pass text to output_func
             try:
                 params = self.output_params + (text,)
                 self.output_func(*params)
@@ -888,7 +886,7 @@ class kvm_expect(kvm_tail):
                 if str.endswith("\n"):
                     str = str[:-1]
                 for line in str.split("\n"):
-                    print_func(line.decode("utf-8", "replace"))
+                    print_func(line)
             data += newdata
 
             done = False
-- 
1.5.4.1

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux