From nobody Sun Apr 12 00:54:59 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=1772545522; cv=none; d=zohomail.com; s=zohoarc; b=BBlOtbJzAM3YmjMXQtw8OchMEJKUfbguwBbaXL/Gxd3MNCIMXjkYVY1utR6lQgLPm8vt5IwdbQP4VX0r8jsPMSagjSHss+TnZztxYtYPin1u/u9+Wl9mE5js3fSssNs5Ki5fWUJ+3IzC7qIelCrUQMKewqI9E9McwUYOnfndNzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772545522; 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=G3fPdMdHEBdTF0DJgik44MNdNThxV7p7R/ftyf2AkEGTvuQljcYnz77hqMmHxmfho2P/D/3WnoZBf3PRg6vB19qJifGDwNXXubpZ4GWOq8pyOi4BhNeak5MgqXmSZKhM2BFyNGt1Q4B6935+V1qvrQSXIdmR9pGC79GtfgU2wDU= 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 1772545522770558.0225338552708; Tue, 3 Mar 2026 05:45:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxQ37-0003Q3-DE; Tue, 03 Mar 2026 08:44:33 -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 1vxQ35-0003P1-0A for qemu-devel@nongnu.org; Tue, 03 Mar 2026 08:44:31 -0500 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxQ33-0001Oc-4f for qemu-devel@nongnu.org; Tue, 03 Mar 2026 08:44:30 -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 7B0165BE11; Tue, 3 Mar 2026 13:43:59 +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 CA5303EA69; Tue, 3 Mar 2026 13:43:57 +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 eFtUI53lpmlXYAAAD6G6ig (envelope-from ); Tue, 03 Mar 2026 13:43:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772545439; 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=mgKa4adyR6FP7GxGPT64uN5sMftyaF8XR13w9LQIWrHWuWWvNsS+QruzF6lxpuFisma2th QraX6xERGWP6Z/86n8eEQBb0m236DQdF56n/Lnd8TOpwKI3s/JIagDim3Cgrhxi0ocuHoJ ZGfEgrGzZULghjwWCa+8ioq/6RxTPHc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772545439; 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=3BlyXdVRnuchxLTc3p4yKDYEUjVYGovw95c4aoBAtLEqplkU09Ck456DMxBzIymelox2UX YwgN/vmi169cxoCA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mgKa4ady; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=3BlyXdVR DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772545439; 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=mgKa4adyR6FP7GxGPT64uN5sMftyaF8XR13w9LQIWrHWuWWvNsS+QruzF6lxpuFisma2th QraX6xERGWP6Z/86n8eEQBb0m236DQdF56n/Lnd8TOpwKI3s/JIagDim3Cgrhxi0ocuHoJ ZGfEgrGzZULghjwWCa+8ioq/6RxTPHc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772545439; 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=3BlyXdVRnuchxLTc3p4yKDYEUjVYGovw95c4aoBAtLEqplkU09Ck456DMxBzIymelox2UX YwgN/vmi169cxoCA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: adityag@linux.ibm.com, thuth@redhat.com, berrange@redhat.com, peterx@redhat.com Subject: [PATCH v3 3/5] tests/functional/migration: Use the migrate_vms helper Date: Tue, 3 Mar 2026 10:43:46 -0300 Message-ID: <20260303134348.8890-4-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260303134348.8890-1-farosas@suse.de> References: <20260303134348.8890-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)[99.99%]; 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)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received,2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Spam-Score: -3.01 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 7B0165BE11 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.131; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 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_RPBL_BLOCKED=0.322, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.141, 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: 1772545524598139100 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: 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