From mboxrd@z Thu Jan 1 00:00:00 1970 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.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 8155CC432C0 for ; Wed, 20 Nov 2019 14:05:35 +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 48F2322445 for ; Wed, 20 Nov 2019 14:05:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="apHhuotX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48F2322445 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]:58446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXQbu-0008FI-AM for qemu-devel@archiver.kernel.org; Wed, 20 Nov 2019 09:05:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47374) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXQaL-0006Uc-Ck for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:03:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXQaK-0000uy-AF for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:03:57 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34136 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iXQaK-0000un-73 for qemu-devel@nongnu.org; Wed, 20 Nov 2019 09:03:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574258635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0V6vvCOmv2t4ZLGO+bnOMW0UAq6PLYbO2CTEzjwL2NM=; b=apHhuotXNgd80JUcSGaCQTjoYlR5zajTexy7Q7I/ClBMEf/LKcjZRvieoC1HL37vYg7UM/ B+iPhJq4QkMzPF/EiGDMOZiow4BCmJD7zhdRmqnP0Ih8+zt+Nn8qkTjuiv/jzXx7l2Llsx FPdwm7H3akpOKcbHVsgejWdnNzAWPfg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-181-3NtVv02hMA-yuG4-UpvUqg-1; Wed, 20 Nov 2019 09:03:52 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 43E47804912; Wed, 20 Nov 2019 14:03:51 +0000 (UTC) Received: from linux.fritz.box.com (unknown [10.36.118.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABCA660BB5; Wed, 20 Nov 2019 14:03:49 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 4/6] iotests: Fix timeout in run_job() Date: Wed, 20 Nov 2019 15:03:17 +0100 Message-Id: <20191120140319.1505-5-kwolf@redhat.com> In-Reply-To: <20191120140319.1505-1-kwolf@redhat.com> References: <20191120140319.1505-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 3NtVv02hMA-yuG4-UpvUqg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 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: 207.211.31.120 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: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" run_job() accepts a wait parameter for a timeout, but it doesn't actually use it. The only thing that is missing is passing it to events_wait(), so do that now. Signed-off-by: Kevin Wolf --- tests/qemu-iotests/iotests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 330681ad02..b409198e47 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -604,7 +604,7 @@ class VM(qtest.QEMUQtestMachine): ] error =3D None while True: - ev =3D filter_qmp_event(self.events_wait(events)) + ev =3D filter_qmp_event(self.events_wait(events, timeout=3Dwai= t)) if ev['event'] !=3D 'JOB_STATUS_CHANGE': if use_log: log(ev) --=20 2.20.1