From nobody Mon Feb 9 04:59:31 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=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1769610561; cv=none; d=zohomail.com; s=zohoarc; b=WOCTw47sBImzQpTu2UPZx6bUoPv+n8IKMBQctMP4vryPsehz8pTlbzNvttcWkQydoyaP0IY1V1G1odypSnvKl76fwxkrn83FjO47k5XtWuzuifzJYKFHQwjPzyDm2ZspkOw/XDNwjQ5ARCdgbJwQhSYAeVUPptmiaNe0DrleMeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769610561; 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=nf4OSkBJ7kcgTkdmI1HKhWyInGpuCisW5+zqYXzN6rc=; b=ZMViv3idm0tEWur6GM13Bl5iVqvyxBZH1oFRKDkHLBBTtGlPHMR+btLXU0kYcjBA8QeMvMhoS91DNWzeXzSOb5UduEMZ5ihSPTpk0joiBpzq7vgY8TzmtpY0NOc28qOW9WWl2K5ypJ9YVyygbgYzpFUcZX2gm7nZ8lHJC3uZPFk= 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 1769610561514874.6922748606881; Wed, 28 Jan 2026 06:29:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vl6XD-0004ry-MG; Wed, 28 Jan 2026 09:28:43 -0500 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 1vl6XB-0004pZ-JY for qemu-devel@nongnu.org; Wed, 28 Jan 2026 09:28:41 -0500 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vl6X9-0007ft-UY for qemu-devel@nongnu.org; Wed, 28 Jan 2026 09:28:41 -0500 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 7C9EE33C5C; Wed, 28 Jan 2026 14:28:38 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B04B93EA61; Wed, 28 Jan 2026 14:28:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id WFZdHBQdemlFfwAAD6G6ig (envelope-from ); Wed, 28 Jan 2026 14:28:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1769610518; h=from:from:reply-to: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=nf4OSkBJ7kcgTkdmI1HKhWyInGpuCisW5+zqYXzN6rc=; b=bVsqriotz9RpX+7/SDv0FizRli2DzCq1SDV1zS5+hYcDS0NufHwuTigeX+CeQNOkxOhRMF meUY8j76dM4hEJi68HcdfCvQ/MY/Pefoh7ECADHTvbGJOc4/lNISXT8gkAcYWh0nlJ1tGu 3ovjcEO/UYGaBQ4y0xvNSoEkvbst6Xs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1769610518; h=from:from:reply-to: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=nf4OSkBJ7kcgTkdmI1HKhWyInGpuCisW5+zqYXzN6rc=; b=0gsH9C3cJ10WsRFHb6rrxNK7GqXcda90SQ+Kvb+OFCpPUJvRMIq1zsmp8Ynk1R+gLXPjet r4XsDF6b8SlsuQAg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=bVsqriot; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=0gsH9C3c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1769610518; h=from:from:reply-to: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=nf4OSkBJ7kcgTkdmI1HKhWyInGpuCisW5+zqYXzN6rc=; b=bVsqriotz9RpX+7/SDv0FizRli2DzCq1SDV1zS5+hYcDS0NufHwuTigeX+CeQNOkxOhRMF meUY8j76dM4hEJi68HcdfCvQ/MY/Pefoh7ECADHTvbGJOc4/lNISXT8gkAcYWh0nlJ1tGu 3ovjcEO/UYGaBQ4y0xvNSoEkvbst6Xs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1769610518; h=from:from:reply-to: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=nf4OSkBJ7kcgTkdmI1HKhWyInGpuCisW5+zqYXzN6rc=; b=0gsH9C3cJ10WsRFHb6rrxNK7GqXcda90SQ+Kvb+OFCpPUJvRMIq1zsmp8Ynk1R+gLXPjet r4XsDF6b8SlsuQAg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Aditya Gupta , Peter Xu , Nicholas Piggin , Harsh Prateek Bora Subject: [PATCH 3/3] tests/functional/ppc64: Remove custom migration routine Date: Wed, 28 Jan 2026 11:28:29 -0300 Message-ID: <20260128142829.25326-4-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260128142829.25326-1-farosas@suse.de> References: <20260128142829.25326-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_DN_SOME(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:dkim,suse.de:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; FREEMAIL_CC(0.00)[linux.ibm.com,redhat.com,gmail.com]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; FREEMAIL_ENVRCPT(0.00)[gmail.com] X-Spam-Score: -3.01 X-Rspamd-Queue-Id: 7C9EE33C5C X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org 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=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 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 @suse.de) X-ZM-MESSAGEID: 1769610565308154100 Content-Type: text/plain; charset="utf-8" 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' Fixes: f4e34d0fd5 ("tests/functional: Add a OS level migration test for pse= ries") Reported-by: Aditya Gupta Signed-off-by: Fabiano Rosas --- tests/functional/migration.py | 4 ++-- tests/functional/ppc64/test_migration.py | 11 ----------- tests/functional/ppc64/test_pseries.py | 6 ++++-- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/tests/functional/migration.py b/tests/functional/migration.py index ac6feeeefb..008be67d3f 100644 --- a/tests/functional/migration.py +++ b/tests/functional/migration.py @@ -65,10 +65,10 @@ def _get_free_port(self, ports): self.skipTest('Failed to find a free port') return port =20 - def migration_with_tcp_localhost(self): + def migration_with_tcp_localhost(self, src_vm=3DNone, dst_vm=3DNone): with Ports() as ports: dest_uri =3D 'tcp:localhost:%u' % self._get_free_port(ports) - self.do_migrate(dest_uri) + self.do_migrate(dest_uri, source_vm=3Dsrc_vm, dest_vm=3Ddst_vm) =20 def migration_with_unix(self): dest_uri =3D 'unix:%s/migration.sock' % self.socket_dir().name diff --git a/tests/functional/ppc64/test_migration.py b/tests/functional/pp= c64/test_migration.py index a3b819680b..7d49ee175b 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 b45763c305..368c85762e 100755 --- a/tests/functional/ppc64/test_pseries.py +++ b/tests/functional/ppc64/test_pseries.py @@ -9,7 +9,7 @@ =20 from qemu_test import QemuSystemTest, Asset from qemu_test import wait_for_console_pattern -from test_migration import PpcMigrationTest +from migration import MigrationTest =20 class PseriesMachine(QemuSystemTest): =20 @@ -116,7 +116,9 @@ 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); + mt =3D MigrationTest() + mt.timeout =3D self.timeout + mt.migration_with_tcp_localhost(source_vm, dest_vm); =20 # ensure the boot proceeds after migration wait_for_console_pattern(self, self.good_message, self.panic_messa= ge, --=20 2.51.0