From nobody Mon Feb 9 06:26:26 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=1770225855; cv=none; d=zohomail.com; s=zohoarc; b=KNfSjy8fyzKhoNUGP/r0Ivea+liPDWIZViUYhdva/5T7J3Qo+0pJ/1fWzdi1bxPx8xnI5wYqMGhBtxy3fNymamicoTupk6hPqJnbl57CCdOE65NKnyGF9RYKtbZpnZ5gHBLaCobPaKg7dg14fkMex/X63ROhSV8iCboLkhI9WHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770225855; h=Content-Type: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=2hXVkzNATR8J0anuapMeOR5MGDaANuJNBMswWbvHgmY=; b=mx9HYthaNutJ0fkEn2JsCd3BbrMvk3bz9wMt/loqEs3+gJlXpO23hW8oKBBXRu8S90nzvoDGXLtiWHawx94ZB1Y7NiFRUriMigXLoXi7TKE/58ka+w+PmKxjG//Gg2ow83cf+6v2vQT6/B0tOFzZRBeKzctCILj2XyI7B7/uu50= 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 1770225855597408.69333207661305; Wed, 4 Feb 2026 09:24:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vngbY-0003pL-G0; Wed, 04 Feb 2026 12:23:52 -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 1vngbW-0003oe-MP for qemu-devel@nongnu.org; Wed, 04 Feb 2026 12:23:50 -0500 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vngbV-0003GO-0z for qemu-devel@nongnu.org; Wed, 04 Feb 2026 12:23:50 -0500 Received: from imap1.dmz-prg2.suse.org (unknown [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-out2.suse.de (Postfix) with ESMTPS id D567B5BCF8; Wed, 4 Feb 2026 17:23: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 4F6B73EA63; Wed, 4 Feb 2026 17:23:37 +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 OGqzBJmAg2nQNgAAD6G6ig (envelope-from ); Wed, 04 Feb 2026 17:23:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770225819; h=from:from:reply-to: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=2hXVkzNATR8J0anuapMeOR5MGDaANuJNBMswWbvHgmY=; b=kalFuKj35sjlziA2tCMlvWEpMvn7GVCrWUL9w8Ir3+AzwvoZVHD1a3T2M8oXsBKovD2clq XdOcXqBcem1vKJzmV86Zd0orFFiJIlNvQNXwqnwgStSrCJ9DPZDEu7jdnDExE/cuHKmttt NhRpKi2bzjgKT1TbQMBXcAW6AoH0zjE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770225819; h=from:from:reply-to: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=2hXVkzNATR8J0anuapMeOR5MGDaANuJNBMswWbvHgmY=; b=EjAy9DRwYXP/ILYg6+4CRuHouyqZwwe8MAZkz6yJNagHvJQEWEXt0PxF74tYi8aHBl5z2j dp8j3RL+j5UZaUDw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770225818; h=from:from:reply-to: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=2hXVkzNATR8J0anuapMeOR5MGDaANuJNBMswWbvHgmY=; b=Pyl+Q2JB4D3jrsW3eLt89v6rckOKVnb67D/ZVN5bccS+rgUygdDcKEYg9M24K4uAHv0RJm Q1h3cG95gmhUi9bFYOsc7NtotsFbBIRbKlsDEisO3tqzx5R3bmu4XtAOWdfwXDxL/LeCYM wwCrqzmfvVFUIESNJqdNyNJXkVv/xUE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770225818; h=from:from:reply-to: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=2hXVkzNATR8J0anuapMeOR5MGDaANuJNBMswWbvHgmY=; b=PuwhP6Ohg5cyd+ZlTKCaIO7ynTr5NCVUJ/d1gF7Ljf6SLEYHVmSEMIdS0HgFKULYqJfux7 kDKy5Lkj9uFQLrAw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: thuth@redhat.com, berrange@redhat.com, peterx@redhat.com Subject: [PATCH v2 1/4] tests/functional/migration: Use socket_dir Date: Wed, 4 Feb 2026 14:23:29 -0300 Message-ID: <20260204172332.21367-2-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260204172332.21367-1-farosas@suse.de> References: <20260204172332.21367-1-farosas@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.30 X-Spamd-Result: default: False [-3.30 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email] 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=2a07:de40:b251:101:10:150:64:2; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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) (identity @suse.de) X-ZM-MESSAGEID: 1770225857072158500 Use QemuBaseTest.socket_dir instead of calling tempfile directly so all tests have consistent directory prefixes. Suggested-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Xu Signed-off-by: Fabiano Rosas Reviewed-by: Thomas Huth --- tests/functional/migration.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/functional/migration.py b/tests/functional/migration.py index 2bfb1f7790..0aa873edba 100644 --- a/tests/functional/migration.py +++ b/tests/functional/migration.py @@ -11,7 +11,6 @@ # 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 -import tempfile import time =20 from qemu_test import QemuSystemTest, which @@ -65,9 +64,8 @@ def migration_with_tcp_localhost(self): self.do_migrate(dest_uri) =20 def migration_with_unix(self): - with tempfile.TemporaryDirectory(prefix=3D'socket_') as socket_pat= h: - dest_uri =3D 'unix:%s/qemu-test.sock' % socket_path - self.do_migrate(dest_uri) + dest_uri =3D 'unix:%s/migration.sock' % self.socket_dir().name + self.do_migrate(dest_uri) =20 def migration_with_exec(self): if not which('ncat'): --=20 2.51.0 From nobody Mon Feb 9 06:26:26 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=1770225867; cv=none; d=zohomail.com; s=zohoarc; b=KO2ETVprIEqnGV0iKSC1lyrH/UlyToYie+We8ukXeGjL3A44JKobbIf7/6qQnI8ZNE1rN2OsF3GQQECjvyxsOtzbsQyGHhit9Rry1d5nhlOWgFyf8WXNz33wA6TQuFdAyXc1kbs5+xgRoFh64EFsPNyAq9N8JJM/Qufpk4U+xMg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770225867; 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=CK3MqBz7nWHDbJwoF86o05bOuAWFxATe2udVQsxhLeo=; b=ElHP5CAp5PC4Sw7R/Jpg7sVPqkmwUC7lRg8YuH2ZoEDe+Ev5SYMhQUFgcZVWR0e/V9fGcKcf9bmJ3zA+UBjDdmmA4ZnE5HYXiGNzaNAeU1VASvNqvvsbR2q8XwiPm95iW98a0GIHRKWuDD5q1MAnEAVIrcp0EhTSHl2//ZSCP4s= 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 1770225867389937.569526798895; Wed, 4 Feb 2026 09:24:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vngbl-0003tQ-4o; Wed, 04 Feb 2026 12:24:05 -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 1vngbb-0003qC-Rs for qemu-devel@nongnu.org; Wed, 04 Feb 2026 12:23:57 -0500 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vngba-0003HJ-C2 for qemu-devel@nongnu.org; Wed, 04 Feb 2026 12:23:55 -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-out2.suse.de (Postfix) with ESMTPS id D85465BD01; Wed, 4 Feb 2026 17:23:40 +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 52D5A3EA64; Wed, 4 Feb 2026 17:23:39 +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 GFmOBZuAg2nQNgAAD6G6ig (envelope-from ); Wed, 04 Feb 2026 17:23:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770225821; 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=CK3MqBz7nWHDbJwoF86o05bOuAWFxATe2udVQsxhLeo=; b=TmMlVoWO5I0GKuk3UaNqAsCB8RY0HN6H0487kGaXkhACG4ga8RvscUTSIge+3zo0C49WPD CwlsEubPrRrkxiZB7NJj6JO2tihCA2EAb3UykNKNMnmYyYtJRLX/kOroT48dFcVexrQqBF KUe1YioEJ4luZ5azvtdy7pMktI4Ny8Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770225821; 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=CK3MqBz7nWHDbJwoF86o05bOuAWFxATe2udVQsxhLeo=; b=/Ngmqjv8vxqIZi5U+GeGptnjbsAppaxPtQ9Uw2V+/SVl7h9d1KAhAf4eMWeBMhFgf0lo3y KJ8vzoVUBiUpTADg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=RwRrrk8J; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=HBA2987K DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770225820; 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=CK3MqBz7nWHDbJwoF86o05bOuAWFxATe2udVQsxhLeo=; b=RwRrrk8JU19e7L3WgSXaJeVonvE7bOB7gqGZhKB7WOWcJRPh3N2+jt/cQw1DexTBS4xj6/ sZv8dRnkI6kpxiz8SPOVgXInZWD6u9THrGoGQX4MhaqJryvoswq+latfCGv2B5sfgpG1fy HAkXrxTWfF/zf7QqLGB62l2XHBi2vSQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770225820; 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=CK3MqBz7nWHDbJwoF86o05bOuAWFxATe2udVQsxhLeo=; b=HBA2987KeTMMYbbMAZ/9NK3odluVkCCP/rCHE5JJJ0SrdHD168jS+JdP50KI1dH5gbIo8C I5wfWZjUC0QoFZDw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: thuth@redhat.com, berrange@redhat.com, peterx@redhat.com Subject: [PATCH v2 2/4] tests/functional/migration: Add migrate_vms Date: Wed, 4 Feb 2026 14:23:30 -0300 Message-ID: <20260204172332.21367-3-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260204172332.21367-1-farosas@suse.de> References: <20260204172332.21367-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.01 X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Queue-Id: D85465BD01 X-Rspamd-Server: rspamd1.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=2a07:de40:b251:101:10:150:64:2; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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) (identity @suse.de) X-ZM-MESSAGEID: 1770225868483158500 Content-Type: text/plain; charset="utf-8" Add a migration helper to MigrationTest that uses the migrate-incoming QMP commmand and takes the already instantiated VMs. The -incoming 'defer' command line option is preferred way instead of the -incoming URI syntax that's currently used. Suggested-by: Peter Xu Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu Reviewed-by: Thomas Huth --- tests/functional/migration.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/functional/migration.py b/tests/functional/migration.py index 0aa873edba..3362e5c743 100644 --- a/tests/functional/migration.py +++ b/tests/functional/migration.py @@ -40,6 +40,11 @@ def assert_migration(self, src_vm, dst_vm): self.assertEqual(dst_vm.cmd('query-status')['status'], 'running') self.assertEqual(src_vm.cmd('query-status')['status'],'postmigrate= ') =20 + def migrate_vms(self, dst_uri, src_uri, dst_vm, src_vm): + dst_vm.qmp('migrate-incoming', uri=3Ddst_uri) + src_vm.qmp('migrate', uri=3Dsrc_uri) + self.assert_migration(src_vm, dst_vm) + def do_migrate(self, dest_uri, src_uri=3DNone): dest_vm =3D self.get_vm('-incoming', dest_uri, name=3D"dest-qemu") dest_vm.add_args('-nodefaults') --=20 2.51.0 From nobody Mon Feb 9 06:26:26 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=1770225883; cv=none; d=zohomail.com; s=zohoarc; b=OLWZJXW/POf9OsXuff3R2OnUwYg6XyZde6+jPG3ONtQKkCNYuC5nOH/xKwk/S6Ve7Hx74a/uKvKbEmkBz+WQ7iU9HSqIcqLCg9bGf2oyFln0aCO7MEMcec8Um+jIftvZ/M6PwCx5cN51mwQ6nqRVcSB25AZ+0kMtD6SJid3BNSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770225883; 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=XAMl8TjKrno+NXucicsGsu9H+ENi6nLYqJAg2vADj2c=; b=AqENYuVgM+gpGyrBAQ7gM8+1wVyBoJ+9rwzaCmy215kasCBo5q0WHemshq7aaCEckEi7b0yt12nZYraxUghqmXtANtLejueVFgDCVQIVsWYD5GTaIBgzHIqSp6S9MwO4xtrwN62Rs/DFhk0HYfnlqFAgVy9c8+EPfNHidQFqQoA= 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 1770225883052993.652566496513; Wed, 4 Feb 2026 09:24:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vngbm-0003uw-Hf; Wed, 04 Feb 2026 12:24:06 -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 1vngbg-0003qZ-LM for qemu-devel@nongnu.org; Wed, 04 Feb 2026 12:24:04 -0500 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vngbf-0003Hj-1T for qemu-devel@nongnu.org; Wed, 04 Feb 2026 12:24:00 -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-out2.suse.de (Postfix) with ESMTPS id DB4C85BCE2; Wed, 4 Feb 2026 17:23:42 +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 554A93EA63; Wed, 4 Feb 2026 17:23:41 +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 4GAnBp2Ag2nQNgAAD6G6ig (envelope-from ); Wed, 04 Feb 2026 17:23:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770225822; 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=XAMl8TjKrno+NXucicsGsu9H+ENi6nLYqJAg2vADj2c=; b=0mKjR60I166TsiBYVDyBi1XgKpdpB8zyMOryfI3g95FfhmZW71iRG/v87rY1MGQysTKUHv 9Ya0xkxpvqjJbg7eZ3crcceLwg5D0wrPZNn8HKYEonFIN9wxbI7+fKEmdgF8Dtz527zlmK XshQqUwvf8LWYN1iMGq4AJGRjmZ/NpY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770225822; 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=XAMl8TjKrno+NXucicsGsu9H+ENi6nLYqJAg2vADj2c=; b=/CEiLWylV/yfejDe04tnZwb6lPllQEM1yDOcJIJdROC0TYoHOEUSePWw8U0NZaGzmDIkG4 eH9rO/dV+OgzaIAA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=0mKjR60I; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="/CEiLWyl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770225822; 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=XAMl8TjKrno+NXucicsGsu9H+ENi6nLYqJAg2vADj2c=; b=0mKjR60I166TsiBYVDyBi1XgKpdpB8zyMOryfI3g95FfhmZW71iRG/v87rY1MGQysTKUHv 9Ya0xkxpvqjJbg7eZ3crcceLwg5D0wrPZNn8HKYEonFIN9wxbI7+fKEmdgF8Dtz527zlmK XshQqUwvf8LWYN1iMGq4AJGRjmZ/NpY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770225822; 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=XAMl8TjKrno+NXucicsGsu9H+ENi6nLYqJAg2vADj2c=; b=/CEiLWylV/yfejDe04tnZwb6lPllQEM1yDOcJIJdROC0TYoHOEUSePWw8U0NZaGzmDIkG4 eH9rO/dV+OgzaIAA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: thuth@redhat.com, berrange@redhat.com, peterx@redhat.com Subject: [PATCH v2 3/4] tests/functional/migration: Use the migrate_vms helper Date: Wed, 4 Feb 2026 14:23:31 -0300 Message-ID: <20260204172332.21367-4-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260204172332.21367-1-farosas@suse.de> References: <20260204172332.21367-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.01 X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Queue-Id: DB4C85BCE2 X-Rspamd-Server: rspamd1.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=2a07:de40:b251:101:10:150:64:2; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: 1770225884791158500 Content-Type: text/plain; charset="utf-8" Change do_migrate() to call the migrate_vms() helper and provide it with the two VMs already created. Rename do_migrate -> migrate and adjust the callers. While here, standardize on the "src" and "dst" names. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu Reviewed-by: Thomas Huth --- tests/functional/migration.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/functional/migration.py b/tests/functional/migration.py index 3362e5c743..49347a30bb 100644 --- a/tests/functional/migration.py +++ b/tests/functional/migration.py @@ -45,17 +45,19 @@ def migrate_vms(self, dst_uri, src_uri, dst_vm, src_vm): src_vm.qmp('migrate', uri=3Dsrc_uri) self.assert_migration(src_vm, dst_vm) =20 - def do_migrate(self, dest_uri, src_uri=3DNone): - dest_vm =3D self.get_vm('-incoming', dest_uri, name=3D"dest-qemu") - dest_vm.add_args('-nodefaults') - dest_vm.launch() + def migrate(self, dst_uri, src_uri=3DNone): + dst_vm =3D self.get_vm('-incoming', 'defer', name=3D"dst-qemu") + dst_vm.add_args('-nodefaults') + dst_vm.launch() + + src_vm =3D self.get_vm(name=3D"src-qemu") + src_vm.add_args('-nodefaults') + src_vm.launch() + if src_uri is None: - src_uri =3D dest_uri - source_vm =3D self.get_vm(name=3D"source-qemu") - source_vm.add_args('-nodefaults') - source_vm.launch() - source_vm.qmp('migrate', uri=3Dsrc_uri) - self.assert_migration(source_vm, dest_vm) + src_uri =3D dst_uri + + self.migrate_vms(dst_uri, src_uri, dst_vm, src_vm) =20 def _get_free_port(self, ports): port =3D ports.find_free_port() @@ -65,18 +67,18 @@ def _get_free_port(self, ports): =20 def migration_with_tcp_localhost(self): with Ports() as ports: - dest_uri =3D 'tcp:localhost:%u' % self._get_free_port(ports) - self.do_migrate(dest_uri) + dst_uri =3D 'tcp:localhost:%u' % self._get_free_port(ports) + self.migrate(dst_uri) =20 def migration_with_unix(self): - dest_uri =3D 'unix:%s/migration.sock' % self.socket_dir().name - self.do_migrate(dest_uri) + dst_uri =3D 'unix:%s/migration.sock' % self.socket_dir().name + self.migrate(dst_uri) =20 def migration_with_exec(self): if not which('ncat'): self.skipTest('ncat is not available') with Ports() as ports: free_port =3D self._get_free_port(ports) - dest_uri =3D 'exec:ncat -l localhost %u' % free_port + dst_uri =3D 'exec:ncat -l localhost %u' % free_port src_uri =3D 'exec:ncat localhost %u' % free_port - self.do_migrate(dest_uri, src_uri) + self.migrate(dst_uri, src_uri) --=20 2.51.0 From nobody Mon Feb 9 06:26:26 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=1770225872; cv=none; d=zohomail.com; s=zohoarc; b=fX39DLwtSYhwM6Cqb0Ev5vQtCia+/7lXS7aQjUIu59RVvf9cl43LJnurTjWg2z8OS0Cy0oDpEeiBOwpwAx1fU5xQ0SyZvE2BNWfE2JCvRfyFYWamc/YPSj3fG6Fi/1WrDdt4DbxQQNnfWYYoiAgVCZsX71yZoGGDHkOU97nQ3+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770225872; 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=9UMKFC9Sjcsqv90X7BlOJWnP8qOA3DAXRsDPDpHiRPs=; b=co0tFlYto98H/Mcw1OjgDRmGcjNeC8hKIHLn+D3QShe7Szumf3V7pabaKpl2wMH7+mskY8G5ohbZBeEVOLrDHaOpTVtA096wRCxKBDol1ToLcFIPitTDkC1M5KI4cKo6s7B50SDf19oD7jBG3Pdb0dQSsiti8i+8k9Oa7uyTP0g= 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 1770225872252236.57449892825412; Wed, 4 Feb 2026 09:24:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vngbZ-0003pb-Ha; Wed, 04 Feb 2026 12:23:53 -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 1vngbX-0003om-3W for qemu-devel@nongnu.org; Wed, 04 Feb 2026 12:23:51 -0500 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vngbV-0003GP-0z for qemu-devel@nongnu.org; Wed, 04 Feb 2026 12:23:50 -0500 Received: from imap1.dmz-prg2.suse.org (unknown [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 A48DF347FC; Wed, 4 Feb 2026 17:23:45 +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 5BB973EA63; Wed, 4 Feb 2026 17:23:43 +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 wO6jB5+Ag2nQNgAAD6G6ig (envelope-from ); Wed, 04 Feb 2026 17:23:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770225825; 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=9UMKFC9Sjcsqv90X7BlOJWnP8qOA3DAXRsDPDpHiRPs=; b=aVxLFXFr6xt/0YzNo0Ta8NPSeuBUKZDY7ele5jYO85hNgvpIwSLAmtFhnnJppDFEMW9GIy Gdq9Y97Hjfi6EXsZeokjgQ1YN6OzA48Q3CNxfmGbSW5SmQ2RhAkxm6SiaxMsMDV5Jwq82R y1rFVP5SkYf5eg6deBpwLqld664GIgo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770225825; 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=9UMKFC9Sjcsqv90X7BlOJWnP8qOA3DAXRsDPDpHiRPs=; b=LdZkoGM8GiHfkwL9vlJmuBmXBWHTqyuneRQ37n0Vz0d66kfh4MseDReTC87c1iik+B8aTP cMTXic9NL10ZulCg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770225825; 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=9UMKFC9Sjcsqv90X7BlOJWnP8qOA3DAXRsDPDpHiRPs=; b=aVxLFXFr6xt/0YzNo0Ta8NPSeuBUKZDY7ele5jYO85hNgvpIwSLAmtFhnnJppDFEMW9GIy Gdq9Y97Hjfi6EXsZeokjgQ1YN6OzA48Q3CNxfmGbSW5SmQ2RhAkxm6SiaxMsMDV5Jwq82R y1rFVP5SkYf5eg6deBpwLqld664GIgo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770225825; 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=9UMKFC9Sjcsqv90X7BlOJWnP8qOA3DAXRsDPDpHiRPs=; b=LdZkoGM8GiHfkwL9vlJmuBmXBWHTqyuneRQ37n0Vz0d66kfh4MseDReTC87c1iik+B8aTP cMTXic9NL10ZulCg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: thuth@redhat.com, berrange@redhat.com, peterx@redhat.com, Aditya Gupta , Nicholas Piggin , Harsh Prateek Bora Subject: [PATCH v2 4/4] tests/functional/ppc64: Remove custom migration routine Date: Wed, 4 Feb 2026 14:23:32 -0300 Message-ID: <20260204172332.21367-5-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260204172332.21367-1-farosas@suse.de> References: <20260204172332.21367-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[redhat.com,linux.ibm.com,gmail.com]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmail.com] X-Spam-Score: -2.80 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=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: 1770225873684154100 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 Acked-by: Peter Xu --- tests/functional/migration.py | 5 +++++ tests/functional/ppc64/test_migration.py | 11 ----------- tests/functional/ppc64/test_pseries.py | 6 ++++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/tests/functional/migration.py b/tests/functional/migration.py index 49347a30bb..e995328e83 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 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..3996a4a878 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_vms(dest_vm, source_vm); =20 # ensure the boot proceeds after migration wait_for_console_pattern(self, self.good_message, self.panic_messa= ge, --=20 2.51.0