From patchwork Fri Jun 18 00:14:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 106782 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5I0FcCT016045 for ; Fri, 18 Jun 2010 00:15:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760925Ab0FRAP3 (ORCPT ); Thu, 17 Jun 2010 20:15:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51043 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760917Ab0FRAPS (ORCPT ); Thu, 17 Jun 2010 20:15:18 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5I0FF8b025463 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 17 Jun 2010 20:15:15 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5I0FBGn030723; Thu, 17 Jun 2010 20:15:11 -0400 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o5I0EljX005733; Thu, 17 Jun 2010 20:15:10 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 17/18] KVM test: kvm_subprocess.py: don't sanitize text before passing it to callbacks Date: Fri, 18 Jun 2010 03:14:34 +0300 Message-Id: <1276820075-31310-17-git-send-email-mgoldish@redhat.com> In-Reply-To: <1276820075-31310-16-git-send-email-mgoldish@redhat.com> References: <1276820075-31310-1-git-send-email-mgoldish@redhat.com> <1276820075-31310-2-git-send-email-mgoldish@redhat.com> <1276820075-31310-3-git-send-email-mgoldish@redhat.com> <1276820075-31310-4-git-send-email-mgoldish@redhat.com> <1276820075-31310-5-git-send-email-mgoldish@redhat.com> <1276820075-31310-6-git-send-email-mgoldish@redhat.com> <1276820075-31310-7-git-send-email-mgoldish@redhat.com> <1276820075-31310-8-git-send-email-mgoldish@redhat.com> <1276820075-31310-9-git-send-email-mgoldish@redhat.com> <1276820075-31310-10-git-send-email-mgoldish@redhat.com> <1276820075-31310-11-git-send-email-mgoldish@redhat.com> <1276820075-31310-12-git-send-email-mgoldish@redhat.com> <1276820075-31310-13-git-send-email-mgoldish@redhat.com> <1276820075-31310-14-git-send-email-mgoldish@redhat.com> <1276820075-31310-15-git-send-email-mgoldish@redhat.com> <1276820075-31310-16-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 18 Jun 2010 00:15:38 +0000 (UTC) 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