From nobody Mon Nov 25 07:46:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1716369820; cv=none; d=zohomail.com; s=zohoarc; b=IAGBXzj09rrF5Bvga7IeQilURshVA9ZV7sH2h2n6fJ02pZq8SkKLzihlOq+9t87no9xjJ1mTjTJAaYbXtBklnkluy8jOZK1zZP7nTb8P5Z7zV9ItcGSwkurKqOwplS6Vh5FVbYnUYo6Fa4iz9A5Wgb1Xzw3gBFC2yYD6JiVo/P8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716369820; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1wHqoMjWqmcrD7WUN/4EkY94+5uLPVDFe8nc6nCJ3GA=; b=NbQTrkonOpyvOCB3pDWygGCvwYjMaDXlbM+rqh241AbD/b2yfkBuoiypKemT9A5eEMTkKR4zGNzhR5coOqvgQOBjFuE/yzaHy2cfr67PsAmIM9gmkJGDiFIRsXHDUDi3fQHZGxV2yVrWq602rXVJJAlzNxWvNVySTjAAtFNVKvc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1716369820094344.708706350184; Wed, 22 May 2024 02:23:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9iBj-0000RT-HZ; Wed, 22 May 2024 05:23:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9iBi-0000OS-17 for qemu-devel@nongnu.org; Wed, 22 May 2024 05:23:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9iBf-0004ke-Fh for qemu-devel@nongnu.org; Wed, 22 May 2024 05:23:09 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-613-XfwEq2BnM8GHvjQNld6njg-1; Wed, 22 May 2024 05:23:04 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 507378025FC; Wed, 22 May 2024 09:23:04 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 193852026D68; Wed, 22 May 2024 09:23:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716369786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=1wHqoMjWqmcrD7WUN/4EkY94+5uLPVDFe8nc6nCJ3GA=; b=Yk5fi2D846MxJe3jTPNRNA1Lw1kmCYCovhyfoIFCti+W/B1W3MmZDJrUPF07Q0lXyguza+ 56TEk8OukbjuTPdXdf1L4lz/maLZOVs7LWtv0OX7Y9ZELuqYN+BEb5eElvqnbhJmG8SOjH 3Wn/umxKAWquCaJhL97iWDDfCT4f6jA= X-MC-Unique: XfwEq2BnM8GHvjQNld6njg-1 From: Thomas Huth To: Peter Xu , Fabiano Rosas , qemu-devel@nongnu.org Cc: Paolo Bonzini Subject: [PATCH] tests/qtest/migration-test: Fix the check for a successful run of analyze-migration.py Date: Wed, 22 May 2024 11:23:01 +0200 Message-ID: <20240522092301.421883-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1716369820804100001 Content-Type: text/plain; charset="utf-8" If analyze-migration.py cannot be run or crashes, the error is currently ignored since the code only checks for nonzero values in case the child exited properly. For example, if you run the test with a non-existing Python interpreter, it still succeeds: $ PYTHON=3Dwrongpython QTEST_QEMU_BINARY=3D./qemu-system-x86_64 tests/qtes= t/migration-test ... # Running /x86_64/migration/analyze-script # Using machine type: pc-q35-9.1 # starting QEMU: exec ./qemu-system-x86_64 -qtest unix:/tmp/qtest-417639.s= ock -qtest-log /dev/null -chardev socket,path=3D/tmp/qtest-417639.qmp,id=3D= char0 -mon chardev=3Dchar0,mode=3Dcontrol -display none -audio none -accel = kvm -accel tcg -machine pc-q35-9.1, -name source,debug-threads=3Don -m 150M= -serial file:/tmp/migration-test-XPLUN2/src_serial -drive if=3Dnone,id=3Dd= 0,file=3D/tmp/migration-test-XPLUN2/bootsect,format=3Draw -device ide-hd,dr= ive=3Dd0,secs=3D1,cyls=3D1,heads=3D1 -uuid 11111111-1111-1111-1111-111111= 111111 -accel qtest # starting QEMU: exec ./qemu-system-x86_64 -qtest unix:/tmp/qtest-417639.s= ock -qtest-log /dev/null -chardev socket,path=3D/tmp/qtest-417639.qmp,id=3D= char0 -mon chardev=3Dchar0,mode=3Dcontrol -display none -audio none -accel = kvm -accel tcg -machine pc-q35-9.1, -name target,debug-threads=3Don -m 150M= -serial file:/tmp/migration-test-XPLUN2/dest_serial -incoming tcp:127.0.0.= 1:0 -drive if=3Dnone,id=3Dd0,file=3D/tmp/migration-test-XPLUN2/bootsect,for= mat=3Draw -device ide-hd,drive=3Dd0,secs=3D1,cyls=3D1,heads=3D1 -accel = qtest ** ERROR:../../devel/qemu/tests/qtest/migration-test.c:1603:test_analyze_scri= pt: code should not be reached migration-test: ../../devel/qemu/tests/qtest/libqtest.c:240: qtest_wait_qe= mu: Assertion `pid =3D=3D s->qemu_pid' failed. migration-test: ../../devel/qemu/tests/qtest/libqtest.c:240: qtest_wait_qe= mu: Assertion `pid =3D=3D s->qemu_pid' failed. ok 2 /x86_64/migration/analyze-script ... Let's better fail the test in case the child did not exit properly, too. Signed-off-by: Thomas Huth Reviewed-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 5b4eca2b20..b7e3406471 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1604,7 +1604,7 @@ static void test_analyze_script(void) } =20 g_assert(waitpid(pid, &wstatus, 0) =3D=3D pid); - if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) !=3D 0) { + if (!WIFEXITED(wstatus) || WEXITSTATUS(wstatus) !=3D 0) { g_test_message("Failed to analyze the migration stream"); g_test_fail(); } --=20 2.45.1