Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C441FFA3728 for ; Wed, 16 Oct 2019 19:28:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F98B2064B for ; Wed, 16 Oct 2019 19:28:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F98B2064B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKoyB-00060p-NR for qemu-devel@archiver.kernel.org; Wed, 16 Oct 2019 15:28:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33203) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKovH-0002IK-CI for qemu-devel@nongnu.org; Wed, 16 Oct 2019 15:25:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKovF-0002ln-UL for qemu-devel@nongnu.org; Wed, 16 Oct 2019 15:25:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60188) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKovD-0002jd-M4; Wed, 16 Oct 2019 15:25:23 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E718B18CB904; Wed, 16 Oct 2019 19:25:22 +0000 (UTC) Received: from localhost (ovpn-116-20.phx2.redhat.com [10.3.116.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 854CE60BF7; Wed, 16 Oct 2019 19:25:22 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 10/10] image-fuzzer: Use errors parameter of subprocess.Popen() Date: Wed, 16 Oct 2019 16:24:30 -0300 Message-Id: <20191016192430.25098-11-ehabkost@redhat.com> In-Reply-To: <20191016192430.25098-1-ehabkost@redhat.com> References: <20191016192430.25098-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Wed, 16 Oct 2019 19:25:22 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Instead of manually encoding stderr and stdout output, use `errors` parameter of subprocess.Popen(). This will make process.communicate() return unicode strings instead of bytes objects. Signed-off-by: Eduardo Habkost --- tests/image-fuzzer/runner.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/image-fuzzer/runner.py b/tests/image-fuzzer/runner.py index 0793234815..4ba5c79e13 100755 --- a/tests/image-fuzzer/runner.py +++ b/tests/image-fuzzer/runner.py @@ -79,16 +79,13 @@ def run_app(fd, q_args): devnull =3D open('/dev/null', 'r+') process =3D subprocess.Popen(q_args, stdin=3Ddevnull, stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.PIPE) + stderr=3Dsubprocess.PIPE, + errors=3D'replace') try: out, err =3D process.communicate() signal.alarm(0) - # fd is a text file, so we need to decode the process output bef= ore - # writing to it. - # We could be simply using the `errors` parameter of subprocess.= Popen(), - # but this will be possible only after migrating to Python 3 - fd.write(out.decode(errors=3D'replace')) - fd.write(err.decode(errors=3D'replace')) + fd.write(out) + fd.write(err) fd.flush() return process.returncode =20 --=20 2.21.0