From nobody Mon Apr 29 06:54:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570796406; cv=none; d=zoho.com; s=zohoarc; b=aOgDUvYyZW9ve1bfUNOvNXPLCA6rM+2nZwrrN4TdCHiWwhT5bK1QbjuTjfNanpqDEK1x4IzFqNa2rEAB4wQaI5AljBWHhLULPXHs/X7GRHydSYLAIL/Kzl1Tv4oi2rLJuQJaK9kr8rF3q/70B8eR97xeb/81I1rl7lQ+kvgfAOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570796406; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=+lEsSyBZjDlW1NEq5UT2fTRIfZtJxRqQzKBE8h4DXWE=; b=E4bElF0ifNxonGJvbJpC7+e65GY00qqSIbwgZ49WcJ8Lnf2bM66kjHy7gX5ih9cs2wuKi4S8Cof7zpHeb5/JUBHuhoJDXSh/hWy623KV1XYkhC3kZq2jEEFl3lXAZ3mr+8Ey6wNJQ958X+FqeZ+u9U534SkxPwsCTNf/OTt7pEU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570796406909518.124689357427; Fri, 11 Oct 2019 05:20:06 -0700 (PDT) Received: from localhost ([::1]:49494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iItts-0002G5-Lt for importer@patchew.org; Fri, 11 Oct 2019 08:20:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52068) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIts8-0000rc-7P for qemu-devel@nongnu.org; Fri, 11 Oct 2019 08:18:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIts7-0001DL-2a for qemu-devel@nongnu.org; Fri, 11 Oct 2019 08:18:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51746) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIts4-0001BZ-F2; Fri, 11 Oct 2019 08:18:12 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id BD0EE81DF7; Fri, 11 Oct 2019 12:18:10 +0000 (UTC) Received: from localhost (ovpn-116-40.ams2.redhat.com [10.36.116.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 35A5110016EB; Fri, 11 Oct 2019 12:18:10 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v2] iotests/028: Fix for long $TEST_DIRs Date: Fri, 11 Oct 2019 14:18:08 +0200 Message-Id: <20191011121808.3243-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 11 Oct 2019 12:18:10 +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: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" For long test image paths, the order of the "Formatting" line and the "(qemu)" prompt after a drive_backup HMP command may be reversed. In fact, the interaction between the prompt and the line may lead to the "Formatting" to being greppable at all after "read"-ing it (if the prompt injects an IFS character into the "Formatting" string). So just wait until we get a prompt. At that point, the block job must have been started, so "info block-jobs" will only return "No active jobs" once it is done. Reported-by: Thomas Huth Signed-off-by: Max Reitz Reviewed-by: John Snow Tested-by: Thomas Huth --- v2: - Fix another kind of race... --- tests/qemu-iotests/028 | 11 ++++++++--- tests/qemu-iotests/028.out | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 71301ec6e5..bba1ee59ae 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -119,9 +119,14 @@ fi # Silence output since it contains the disk image path and QEMU's readline # character echoing makes it very hard to filter the output. Plus, there # is no telling how many times the command will repeat before succeeding. -_send_qemu_cmd $h "drive_backup disk ${TEST_IMG}.copy" "(qemu)" >/dev/null -_send_qemu_cmd $h "" "Formatting" | _filter_img_create -qemu_cmd_repeat=3D20 _send_qemu_cmd $h "info block-jobs" "No active jobs" = >/dev/null +# (Note that creating the image results in a "Formatting..." message over +# stdout, which is the same channel the monitor uses. We cannot reliably +# wait for it because the monitor output may interact with it in such a +# way that _timed_wait_for cannot read it. However, once the block job is +# done, we know that the "Formatting..." message must have appeared +# already, so the output is still deterministic.) +silent=3Dy _send_qemu_cmd $h "drive_backup disk ${TEST_IMG}.copy" "(qemu)" +silent=3Dy qemu_cmd_repeat=3D20 _send_qemu_cmd $h "info block-jobs" "No ac= tive jobs" _send_qemu_cmd $h "info block-jobs" "No active jobs" _send_qemu_cmd $h 'quit' "" =20 diff --git a/tests/qemu-iotests/028.out b/tests/qemu-iotests/028.out index 7d54aeb003..37aed84436 100644 --- a/tests/qemu-iotests/028.out +++ b/tests/qemu-iotests/028.out @@ -468,7 +468,6 @@ No errors were found on the image. =20 block-backup =20 -Formatting 'TEST_DIR/t.IMGFMT.copy', fmt=3DIMGFMT size=3D4294968832 backin= g_file=3DTEST_DIR/t.IMGFMT.base backing_fmt=3DIMGFMT (qemu) info block-jobs No active jobs =3D=3D=3D IO: pattern 195 --=20 2.21.0