From nobody Sat Apr 11 23:04:12 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=1772559241; cv=none; d=zohomail.com; s=zohoarc; b=cRmGoM4IzvlRtOcK09BFGgTXGBHPBSbzgsvammv9mWHar6708h2zCPZKooUzf/0Nx3SsYkpKogI8dWUbDvNzN6iGcKRbJCG/NuMSseFdxjQrysXyLuy5lcaV3uDD1kjpK/NAc0VB/GORYlFpWuIHSQgaa926I31EWI3fYGvk5KI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772559241; 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=7+zQUPXMnug+HQkofy80mbh4qqECMVOMG15OOjxegxI=; b=YZtVKHVnAjFLyQojgLoslGEGO3mFDSxhPAvEbGVrUs70OG+gBsGh958dk7zRSp2YUupczcwBnfRc/s9GBzPTTdmowJrRYFkkFuzpk3i8BPQwE6XJmjyX4BtURMhQON8AFKN4uE1jP6p1tilUe/0dEBtMA90lj+Zsgrm3ie5UO7Q= 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 1772559241451618.7970582262355; Tue, 3 Mar 2026 09:34:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxTcn-0001Aq-Kz; Tue, 03 Mar 2026 12:33:37 -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 1vxTcm-0001Ac-Du for qemu-devel@nongnu.org; Tue, 03 Mar 2026 12:33:36 -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 1vxTcl-0005z5-0z for qemu-devel@nongnu.org; Tue, 03 Mar 2026 12:33:36 -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 68E065BE1D; Tue, 3 Mar 2026 17:33:27 +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 B97D63EA6C; Tue, 3 Mar 2026 17:33:25 +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 4ChBH2Ubp2n+VAAAD6G6ig (envelope-from ); Tue, 03 Mar 2026 17:33:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772559207; 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=7+zQUPXMnug+HQkofy80mbh4qqECMVOMG15OOjxegxI=; b=Rt1qReEPBUqtNvGEaKJNShmEYvzYli0T4JR4CA0rns8NA1fClYMd2NJHgJ97APjCYjIPJ1 s3tagirMY67InjbstW8ITuneYgOe2UKFCrZ1OuzwEH2tRrUVnGHr+PLYzgo3eaVXtP5vbt Z2O7QnVQJEyEtXOZKO4KE5PpF72jQG0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772559207; 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=7+zQUPXMnug+HQkofy80mbh4qqECMVOMG15OOjxegxI=; b=/gWo/VJk7w762o8uQkd0TPeQ6q42dFs1CoCqEkIHZixHdkQDTD51Y+wyvW2D8uI9FvpviH k240c6y/mmD2/IAw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772559207; 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=7+zQUPXMnug+HQkofy80mbh4qqECMVOMG15OOjxegxI=; b=Rt1qReEPBUqtNvGEaKJNShmEYvzYli0T4JR4CA0rns8NA1fClYMd2NJHgJ97APjCYjIPJ1 s3tagirMY67InjbstW8ITuneYgOe2UKFCrZ1OuzwEH2tRrUVnGHr+PLYzgo3eaVXtP5vbt Z2O7QnVQJEyEtXOZKO4KE5PpF72jQG0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772559207; 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=7+zQUPXMnug+HQkofy80mbh4qqECMVOMG15OOjxegxI=; b=/gWo/VJk7w762o8uQkd0TPeQ6q42dFs1CoCqEkIHZixHdkQDTD51Y+wyvW2D8uI9FvpviH k240c6y/mmD2/IAw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: adityag@linux.ibm.com, thuth@redhat.com, berrange@redhat.com, peterx@redhat.com Subject: [PATCH v4 1/4] tests/functional/migration: Use socket_dir Date: Tue, 3 Mar 2026 14:33:17 -0300 Message-ID: <20260303173320.10942-2-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260303173320.10942-1-farosas@suse.de> References: <20260303173320.10942-1-farosas@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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_FIVE(0.00)[5]; 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, imap1.dmz-prg2.suse.org:helo] X-Spam-Score: -3.30 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: 1772559243084139100 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 Reviewed-by: Thomas Huth Signed-off-by: Fabiano Rosas --- 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 Sat Apr 11 23:04:12 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=1772559289; cv=none; d=zohomail.com; s=zohoarc; b=LW7rsA35bi4IBJo3QsoZYWzJoJVcymR4+UQwdOMvvXod4THgq2JGb6pN07FjNK9Y1X6TxKWRzAz8fwnp1hsYYWxq7vmrI1Qilu+Wv/ZMcc4v65XOw/GxTQrlUSoSo/O8AwiWLHRAOYLbFT+PRYx7QmWoHOff0HlB744ivaTIlNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772559289; 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=7WcV0PqlqfUEbE/2ZP05IU9XqI8F/KE5MB+/YpgS/hg=; b=Ai9sraMiuoFkro5aQ9EyolRZLE9PTYPACKyvKSsOewKKWI0tgmkGS3kze3ylWp9GiWYAvpO4fn+rBkbx7ocrHc36zLzDacfUS+dm+E1Z99r8xvSHprbxF04bijbsxcnah5Xn+D1ilv+SuktddT1oXG5n/42etGFRXJdxLV1mQdc= 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 1772559289290984.6471458592172; Tue, 3 Mar 2026 09:34:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxTct-0001EO-W1; Tue, 03 Mar 2026 12:33:44 -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 1vxTcs-0001E9-L4 for qemu-devel@nongnu.org; Tue, 03 Mar 2026 12:33:42 -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 1vxTcr-0005zJ-2z for qemu-devel@nongnu.org; Tue, 03 Mar 2026 12:33:42 -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 8EF225BE1F; Tue, 3 Mar 2026 17:33:29 +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 DEC193EA69; Tue, 3 Mar 2026 17:33:27 +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 SCZVKGcbp2n+VAAAD6G6ig (envelope-from ); Tue, 03 Mar 2026 17:33:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772559209; 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=7WcV0PqlqfUEbE/2ZP05IU9XqI8F/KE5MB+/YpgS/hg=; b=rlqL/hUHmsJ/SYTtI1KgXx8rU2fp9jlrs+yXzbMMhcCcH4vDWNkWLwFIMwfmSjQ0+WA9op wU/HDziy42EkQsKlwB3qRkty4GpoFzuumBaBS1eG6qkuRCCLOz1wW9Bx5FcZRS6s3srLBY rlw0TWJLvFIuO6kAdNHOYW4eHXyG2bI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772559209; 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=7WcV0PqlqfUEbE/2ZP05IU9XqI8F/KE5MB+/YpgS/hg=; b=IXA5veBcLELuVeyVLyx6ox9jGu5o+0moVhesEydvZSZtIuSsMM5zuCg9Fh/e5zDAVdYFwq 89l3qtfZQJTS4jCA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="rlqL/hUH"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=IXA5veBc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772559209; 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=7WcV0PqlqfUEbE/2ZP05IU9XqI8F/KE5MB+/YpgS/hg=; b=rlqL/hUHmsJ/SYTtI1KgXx8rU2fp9jlrs+yXzbMMhcCcH4vDWNkWLwFIMwfmSjQ0+WA9op wU/HDziy42EkQsKlwB3qRkty4GpoFzuumBaBS1eG6qkuRCCLOz1wW9Bx5FcZRS6s3srLBY rlw0TWJLvFIuO6kAdNHOYW4eHXyG2bI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772559209; 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=7WcV0PqlqfUEbE/2ZP05IU9XqI8F/KE5MB+/YpgS/hg=; b=IXA5veBcLELuVeyVLyx6ox9jGu5o+0moVhesEydvZSZtIuSsMM5zuCg9Fh/e5zDAVdYFwq 89l3qtfZQJTS4jCA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: adityag@linux.ibm.com, thuth@redhat.com, berrange@redhat.com, peterx@redhat.com Subject: [PATCH v4 2/4] tests/functional/migration: Add migrate_vms Date: Tue, 3 Mar 2026 14:33:18 -0300 Message-ID: <20260303173320.10942-3-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260303173320.10942-1-farosas@suse.de> References: <20260303173320.10942-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org 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)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns, suse.de:dkim, suse.de:mid, suse.de:email] X-Rspamd-Queue-Id: 8EF225BE1F X-Spam-Score: -3.01 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: 1772559290090158500 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 Reviewed-by: Thomas Huth Reviewed-by: Peter Xu Signed-off-by: Fabiano Rosas --- 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 Sat Apr 11 23:04:12 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=1772559260; cv=none; d=zohomail.com; s=zohoarc; b=CaLmsE7c7AU3FKmtSVMHInRsLObn0mCLt6sgGqt2hZWv1Xl9vHcTJV8uW/zdOYD1F433qEF1CBtsiw8vaswjX323fMCZRdZSABOVrHSIaFW7VYo+UfiDAmadalU7TqcFpx3YPxzwaa+scXPYD7zzcFkZBuLhwNsZYBkCv7gYvbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772559260; 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=Ovzj9oJIHtiVUljGCATbj3fPCXtNEzo9kyOqCRfJvEM=; b=gx2GB87jIbN+iFmB+QuHkqHh8/JC3BPABAUxOA9GNmMwoOTQQQ0c3FVwaDzPyFiVsraZ4oSAC7SLTzHPuAEfHqwEg+CznFNxfjmnJWRnRkL7MQ+cuEVQV4dBLFH+ao+snhfsOriOHUefUtSgtadFZ9VmIGSEkb/LQNbezg8xnqA= 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 1772559260189355.0896890921979; Tue, 3 Mar 2026 09:34:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxTd1-0001F8-6r; Tue, 03 Mar 2026 12:33:51 -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 1vxTcz-0001Ew-8p for qemu-devel@nongnu.org; Tue, 03 Mar 2026 12:33:49 -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 1vxTcx-0005zs-Mr for qemu-devel@nongnu.org; Tue, 03 Mar 2026 12:33:49 -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 B528A5BE14; Tue, 3 Mar 2026 17:33:31 +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 115A13EA69; Tue, 3 Mar 2026 17:33:29 +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 +GbEMWkbp2n+VAAAD6G6ig (envelope-from ); Tue, 03 Mar 2026 17:33:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772559211; 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=Ovzj9oJIHtiVUljGCATbj3fPCXtNEzo9kyOqCRfJvEM=; b=CUpmbfAQZ3CyFIq89DK4DH9OkmSVxAlhWPC0+DxJbSdck+hitP4+tBJVce4059cd/Wh6Oo CvEiWh64KfBHm9HME/RpGW9CI7OGuyZsAA6TeICf8xJnpCz0vY7GYFAzvEn3QRARyQaezd f5MLTVa3Zo07B+yzy8C2oNTRPIbGLOk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772559211; 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=Ovzj9oJIHtiVUljGCATbj3fPCXtNEzo9kyOqCRfJvEM=; b=BYUP67W3A6TDs8O4QUdEAjVGq6IJ5Sw2VuA5QY7xn3xaNkkbI5Ju6npdZ82Ea4UtcerIEG qLBixCWL9vy5xgBw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=CUpmbfAQ; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=BYUP67W3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772559211; 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=Ovzj9oJIHtiVUljGCATbj3fPCXtNEzo9kyOqCRfJvEM=; b=CUpmbfAQZ3CyFIq89DK4DH9OkmSVxAlhWPC0+DxJbSdck+hitP4+tBJVce4059cd/Wh6Oo CvEiWh64KfBHm9HME/RpGW9CI7OGuyZsAA6TeICf8xJnpCz0vY7GYFAzvEn3QRARyQaezd f5MLTVa3Zo07B+yzy8C2oNTRPIbGLOk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772559211; 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=Ovzj9oJIHtiVUljGCATbj3fPCXtNEzo9kyOqCRfJvEM=; b=BYUP67W3A6TDs8O4QUdEAjVGq6IJ5Sw2VuA5QY7xn3xaNkkbI5Ju6npdZ82Ea4UtcerIEG qLBixCWL9vy5xgBw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: adityag@linux.ibm.com, thuth@redhat.com, berrange@redhat.com, peterx@redhat.com Subject: [PATCH v4 3/4] tests/functional/migration: Use the migrate_vms helper Date: Tue, 3 Mar 2026 14:33:19 -0300 Message-ID: <20260303173320.10942-4-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260303173320.10942-1-farosas@suse.de> References: <20260303173320.10942-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)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns, suse.de:mid, suse.de:dkim, suse.de:email] X-Rspamd-Action: no action X-Spam-Score: -3.01 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: B528A5BE14 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: 1772559260973139100 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. Reviewed-by: Thomas Huth Reviewed-by: Peter Xu Signed-off-by: Fabiano Rosas --- 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 Sat Apr 11 23:04:12 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=1772559272; cv=none; d=zohomail.com; s=zohoarc; b=icopkM1vz75oIm28pE+K9lms9vG3N0L6fOXcYjJNjNWB63LggEU9dVApw+LLa7oo1djBXNOPkYtcI7dmMjyCtm8cDs85RuQpo1ufUKw+KFJ/vdUKqDms+HuzOn3LRcEbiEOxc5dNS8PH1yR+1TlOZvKizkLh7lMB4XVjLRL0+uc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772559272; 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=4gCVtxbnn4iRgePjKTQ1hJ/mu2MP3mYjXwHWt4TlNvw=; b=cO1NcaynWXX1NyTOeovNYCe/Yo7uvTdNE/HwENIktnVpt7gcoevsPx5a1uopyiqAg+M5jLmadZuIg8EWCyxUtTK+1b5gRt4AJAX6NBvlVX4nJD9cUjTpSWKyvowacQY4a47mjL0nXSQ95zpI/+zJa9/ycjWkr/VI+1vrzFphK24= 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 1772559272299208.33318690647081; Tue, 3 Mar 2026 09:34:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxTd6-0001G1-Sx; Tue, 03 Mar 2026 12:33:56 -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 1vxTd5-0001FT-25 for qemu-devel@nongnu.org; Tue, 03 Mar 2026 12:33:55 -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 1vxTd3-00060Y-D8 for qemu-devel@nongnu.org; Tue, 03 Mar 2026 12:33:54 -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 5DD245BE36; Tue, 3 Mar 2026 17:33:34 +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 3AEEC3EA69; Tue, 3 Mar 2026 17:33:32 +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 GBxOAGwbp2n+VAAAD6G6ig (envelope-from ); Tue, 03 Mar 2026 17:33:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772559214; 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=4gCVtxbnn4iRgePjKTQ1hJ/mu2MP3mYjXwHWt4TlNvw=; b=m1Ae1jmDtYpxKbi66MLLo7vyr3y4a0VKmdAr+IhcZgZ8s/RUl+tq9JS2uRPUdPTrzZIp+r M7MHFm5pI/0trnkETxZ/sRScS9k2QEalLKXYcy/wfBD1lk3L0d3a+HcH3DhiGI54hS48qs f5AmnmbhZyNspqDVH8B+xntCoj6kRMQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772559214; 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=4gCVtxbnn4iRgePjKTQ1hJ/mu2MP3mYjXwHWt4TlNvw=; b=yOrt2qKaPHLJFIFFuXD51fFcwxVc2O8r5Gks6FEQm3p9/e9PU9yo/9rZWxPN8eMZ/tVu0W 8xm3XwfZWBhJgjAw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1772559214; 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=4gCVtxbnn4iRgePjKTQ1hJ/mu2MP3mYjXwHWt4TlNvw=; b=m1Ae1jmDtYpxKbi66MLLo7vyr3y4a0VKmdAr+IhcZgZ8s/RUl+tq9JS2uRPUdPTrzZIp+r M7MHFm5pI/0trnkETxZ/sRScS9k2QEalLKXYcy/wfBD1lk3L0d3a+HcH3DhiGI54hS48qs f5AmnmbhZyNspqDVH8B+xntCoj6kRMQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1772559214; 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=4gCVtxbnn4iRgePjKTQ1hJ/mu2MP3mYjXwHWt4TlNvw=; b=yOrt2qKaPHLJFIFFuXD51fFcwxVc2O8r5Gks6FEQm3p9/e9PU9yo/9rZWxPN8eMZ/tVu0W 8xm3XwfZWBhJgjAw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: adityag@linux.ibm.com, thuth@redhat.com, berrange@redhat.com, peterx@redhat.com, Nicholas Piggin , Harsh Prateek Bora Subject: [PATCH v4 4/4] tests/functional/ppc64/pseries: Remove custom migration routine Date: Tue, 3 Mar 2026 14:33:20 -0300 Message-ID: <20260303173320.10942-5-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260303173320.10942-1-farosas@suse.de> References: <20260303173320.10942-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 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)[linux.ibm.com,redhat.com,gmail.com]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,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] 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: 1772559273564139100 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' 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 --- 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 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..b28292233d 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.51.0