From patchwork Wed Nov 20 18:44:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 11254693 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 320DC6C1 for ; Wed, 20 Nov 2019 18:52:01 +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 0844D20643 for ; Wed, 20 Nov 2019 18:52:00 +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="Zm0ACfXS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0844D20643 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXV55-0001Ov-V5 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 20 Nov 2019 13:51:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40085) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXUyo-0004C2-T3 for qemu-devel@nongnu.org; Wed, 20 Nov 2019 13:45:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXUym-0005xS-Q2 for qemu-devel@nongnu.org; Wed, 20 Nov 2019 13:45:30 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54313 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 1iXUym-0005wq-FA for qemu-devel@nongnu.org; Wed, 20 Nov 2019 13:45:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574275526; 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=vKw+3MQbNgyiIFkgmDggje2ln5kZwjeMM65Y9tywrg0=; b=Zm0ACfXSAftTIhN+rgsWMj8zYVWbjpFctaroyt6GESfZmpwUbleqlw1U9FA5gfGGSkONF/ c3cKNZdUBFZKbPBGx7CFVed5KFTnHV21PihiTyiVfTtg/FLpOFO0bmUva7byfAfc+OZvMn KbGA+qVdvBTLSHkApmpo1+Y1ZCSNBeg= 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-29-jqrCqNNtOYeoGpYmrCYpyA-1; Wed, 20 Nov 2019 13:45:23 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 49F46107ACC4; Wed, 20 Nov 2019 18:45:22 +0000 (UTC) Received: from linux.fritz.box.com (unknown [10.36.118.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B24621042B7D; Wed, 20 Nov 2019 18:45:20 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH v2 4/6] iotests: Fix timeout in run_job() Date: Wed, 20 Nov 2019 19:44:59 +0100 Message-Id: <20191120184501.28159-5-kwolf@redhat.com> In-Reply-To: <20191120184501.28159-1-kwolf@redhat.com> References: <20191120184501.28159-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: jqrCqNNtOYeoGpYmrCYpyA-1 X-Mimecast-Spam-Score: 0 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+patchwork-qemu-devel=patchwork.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 Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia --- 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 = None while True: - ev = filter_qmp_event(self.events_wait(events)) + ev = filter_qmp_event(self.events_wait(events, timeout=wait)) if ev['event'] != 'JOB_STATUS_CHANGE': if use_log: log(ev)