From nobody Sat Apr 11 21:27:43 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773122198; cv=none; d=zohomail.com; s=zohoarc; b=dopbkwzMQxb+Tm7suscAucRScqBGqlGcIuphditYKMB8iIwwvOdkoLQe8E8UxennuP5EXqyXV1MXvD+0F5GBe82o0ne1P0h9Gy/ClpgwbXDk0ECCnbwk4aqJTXyAId4udRhSBnYYGMg6RGKjMiZy/aAKwVd/l+wHXEl2JYH+NTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773122198; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8111Z95vjiNS3KH7D0G5EqTmKVt2OguTKCPAtweNU4A=; b=flPx+gtIcsX8YdN9yZOTlGehb3QqBPfZxSXj2o2AIbBKPYI+NmAM/y12MSYesk8axnTOxMWhOtb6YYOrOS64io+5V3mFIF4KFYfafE6fX3AK5TzM08rsq1DClOWn3Cox1j8GoHxniek5gN0UorDLnxo6Iili69wSQ8MqqhO32og= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773122198977864.7110060527746; Mon, 9 Mar 2026 22:56:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzq4p-000723-44; Tue, 10 Mar 2026 01:56:19 -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 1vzq4i-0006vy-GG for qemu-devel@nongnu.org; Tue, 10 Mar 2026 01:56:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzq4g-0006Fn-AY for qemu-devel@nongnu.org; Tue, 10 Mar 2026 01:56:11 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-624-TA2DeI9UMe-EcdhVirfCwQ-1; Tue, 10 Mar 2026 01:56:06 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D69DF1955DE2; Tue, 10 Mar 2026 05:56:04 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.44.32.69]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 407561955D87; Tue, 10 Mar 2026 05:56:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773122168; 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: in-reply-to:in-reply-to:references:references; bh=8111Z95vjiNS3KH7D0G5EqTmKVt2OguTKCPAtweNU4A=; b=dpvBVxp3+Ik6KS4x9t4NSVERelWJ7lLQ4+RJPXT9na1pDCeo0Z+yyFT3qrjY9UC2c5MJpN E7p+6fepiuqBI+FZob90V9qVeszrwa+GMjutEcvDWBXPUOMeX3fR/JttlzjpCek0c2XNzc cHRcfyQDZSviuNnDepZBVNoIrQkTl3g= X-MC-Unique: TA2DeI9UMe-EcdhVirfCwQ-1 X-Mimecast-MFC-AGG-ID: TA2DeI9UMe-EcdhVirfCwQ_1773122165 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, Aditya Gupta , Fabiano Rosas , Peter Xu Subject: [PULL 08/25] tests/functional/ppc64/pseries: Remove custom migration routine Date: Tue, 10 Mar 2026 06:55:13 +0100 Message-ID: <20260310055530.8893-9-thuth@redhat.com> In-Reply-To: <20260310055530.8893-1-thuth@redhat.com> References: <20260310055530.8893-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1773122201842154100 Content-Type: text/plain; charset="utf-8" From: Fabiano Rosas Don't implement a custom migration routine at PpcMigrationTest and instead reuse the generic one from MigrationTest. This removes the dependency of PpcMigrationTest from PseriesMachine. Having one test import another causes unittest code to instantiate the imported test, resulting in the setup and teardown methods being invoked for the imported test class, even if no test from that class will be executed. If run in parallel, the extra setup/teardown methods that result from importing can race with the ones from the actual test being executed and cause the following error: File "/tests/functional/qemu_test/testcase.py", line 238, in tearD= own shutil.rmtree(self.workdir) ... FileNotFoundError: [Errno 2] No such file or directory: '/build/tests/functional/ppc64/.../test_migration_with_exec/scratc= h' The PseriesMachine class is changed to inherit from MigrationTest so both the migration routines and the class attributes of PseriesMachine can be accessed without the need to instantiate another object. Fixes: f4e34d0fd5 ("tests/functional: Add a OS level migration test for pse= ries") Reported-by: Aditya Gupta Reviewed-by: Thomas Huth Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu Tested-by: Aditya Gupta Message-ID: <20260303173320.10942-5-farosas@suse.de> [thuth: Remove superfluous ";" as suggested by Aditya] Signed-off-by: Thomas Huth --- tests/functional/migration.py | 5 +++++ tests/functional/ppc64/test_migration.py | 11 ----------- tests/functional/ppc64/test_pseries.py | 10 +++++----- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/tests/functional/migration.py b/tests/functional/migration.py index 49347a30bbf..e995328e833 100644 --- a/tests/functional/migration.py +++ b/tests/functional/migration.py @@ -65,6 +65,11 @@ def _get_free_port(self, ports): self.skipTest('Failed to find a free port') return port =20 + def migration_with_tcp_localhost_vms(self, dst_vm, src_vm): + with Ports() as ports: + uri =3D 'tcp:localhost:%u' % self._get_free_port(ports) + self.migrate_vms(uri, uri, dst_vm, src_vm) + def migration_with_tcp_localhost(self): with Ports() as ports: dst_uri =3D 'tcp:localhost:%u' % self._get_free_port(ports) diff --git a/tests/functional/ppc64/test_migration.py b/tests/functional/pp= c64/test_migration.py index a3b819680bc..7d49ee175bb 100755 --- a/tests/functional/ppc64/test_migration.py +++ b/tests/functional/ppc64/test_migration.py @@ -22,17 +22,6 @@ def test_migration_with_exec(self): self.set_machine('mac99') self.migration_with_exec() =20 - def do_migrate_ppc64_linux(self, source_vm, dest_vm): - with Ports() as ports: - port =3D ports.find_free_port() - if port is None: - self.skipTest('Failed to find a free port') - uri =3D 'tcp:localhost:%u' % port - - dest_vm.qmp('migrate-incoming', uri=3Duri) - source_vm.qmp('migrate', uri=3Duri) - self.assert_migration(source_vm, dest_vm) - =20 if __name__ =3D=3D '__main__': MigrationTest.main() diff --git a/tests/functional/ppc64/test_pseries.py b/tests/functional/ppc6= 4/test_pseries.py index b45763c3050..cb6d25dc816 100755 --- a/tests/functional/ppc64/test_pseries.py +++ b/tests/functional/ppc64/test_pseries.py @@ -7,11 +7,11 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 -from qemu_test import QemuSystemTest, Asset +from qemu_test import Asset from qemu_test import wait_for_console_pattern -from test_migration import PpcMigrationTest +from migration import MigrationTest =20 -class PseriesMachine(QemuSystemTest): +class PseriesMachine(MigrationTest): =20 timeout =3D 90 KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 console=3Dhvc0 ' @@ -116,11 +116,11 @@ def test_ppc64_linux_migration(self): wait_for_console_pattern(self, console_pattern, self.panic_message, vm=3Dsource_vm) =20 - PpcMigrationTest().do_migrate_ppc64_linux(source_vm, dest_vm); + self.migration_with_tcp_localhost_vms(dest_vm, source_vm) =20 # ensure the boot proceeds after migration wait_for_console_pattern(self, self.good_message, self.panic_messa= ge, vm=3Ddest_vm) =20 if __name__ =3D=3D '__main__': - QemuSystemTest.main() + MigrationTest.main() --=20 2.53.0