From patchwork Tue Nov 5 18:08:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabiano Rosas X-Patchwork-Id: 13863327 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0CEACD3177E for ; Tue, 5 Nov 2024 18:13:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8O06-0005nj-Aw; Tue, 05 Nov 2024 13:09:58 -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 1t8Nzr-0005DB-VQ for qemu-devel@nongnu.org; Tue, 05 Nov 2024 13:09:44 -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 1t8Nzq-0004zc-3K for qemu-devel@nongnu.org; Tue, 05 Nov 2024 13:09:43 -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 F29C81F7FB; Tue, 5 Nov 2024 18:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1730830181; 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=eAN1npPbhKKqBsB93svAI3+THRscfnYq3oeLTQttcN4=; b=OFAd/+y1vF1RF5LM3sSw26E9LWZyZ1PRCSqrWL8fh6UTdoZEsKNK4TaGobOTARXPgaluQV af6Uei+ZSkEHwPs+G9JYIWy2JM3WIZj5sZG9b91RLpDJKPbnae2sycIIqtVEA0kDudUTSi UAsNxTdT2f8vh05I011Avx56eemvngw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1730830181; 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=eAN1npPbhKKqBsB93svAI3+THRscfnYq3oeLTQttcN4=; b=pQpUwfyKcmSxm+hhE7CcyqcTdcH2Ulb9xpJoqhBUhxvWa5qwDm0MHLWt5SoM7etAXTLwYj fCqUMlHzUd35E3Aw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1730830181; 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=eAN1npPbhKKqBsB93svAI3+THRscfnYq3oeLTQttcN4=; b=OFAd/+y1vF1RF5LM3sSw26E9LWZyZ1PRCSqrWL8fh6UTdoZEsKNK4TaGobOTARXPgaluQV af6Uei+ZSkEHwPs+G9JYIWy2JM3WIZj5sZG9b91RLpDJKPbnae2sycIIqtVEA0kDudUTSi UAsNxTdT2f8vh05I011Avx56eemvngw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1730830181; 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=eAN1npPbhKKqBsB93svAI3+THRscfnYq3oeLTQttcN4=; b=pQpUwfyKcmSxm+hhE7CcyqcTdcH2Ulb9xpJoqhBUhxvWa5qwDm0MHLWt5SoM7etAXTLwYj fCqUMlHzUd35E3Aw== 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 E29301394A; Tue, 5 Nov 2024 18:09:38 +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 uO/YKWJfKmeCZwAAD6G6ig (envelope-from ); Tue, 05 Nov 2024 18:09:38 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Peter Maydell , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , Laurent Vivier , Paolo Bonzini Subject: [PATCH 20/22] tests/qtest/migration: Pick smoke tests Date: Tue, 5 Nov 2024 15:08:35 -0300 Message-Id: <20241105180837.5990-21-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20241105180837.5990-1-farosas@suse.de> References: <20241105180837.5990-1-farosas@suse.de> MIME-Version: 1.0 X-Spamd-Result: default: False [-2.80 / 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)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL17uas3ff86ioo43146mh3mef)]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid]; RCVD_TLS_ALL(0.00)[] 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, RCVD_IN_DNSWL_NONE=-0.0001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Choose a few tests per group and move them from the full set to the smoke set. Signed-off-by: Fabiano Rosas --- tests/qtest/migration/compression-tests.c | 7 +++---- tests/qtest/migration/cpr-tests.c | 3 ++- tests/qtest/migration/misc-tests.c | 12 ++++++------ tests/qtest/migration/postcopy-tests.c | 15 ++++++++------- tests/qtest/migration/precopy-tests.c | 19 +++++++++---------- tests/qtest/migration/tls-tests.c | 7 ++++--- 6 files changed, 32 insertions(+), 31 deletions(-) diff --git a/tests/qtest/migration/compression-tests.c b/tests/qtest/migration/compression-tests.c index 87629e3b44..df13db9ac7 100644 --- a/tests/qtest/migration/compression-tests.c +++ b/tests/qtest/migration/compression-tests.c @@ -207,7 +207,9 @@ static void test_multifd_tcp_zlib(void) void migration_test_add_compression_smoke(MigrationTestEnv *env) { tmpfs = env->tmpfs; - /* TODO: add smoke tests */ + + migration_test_add("/migration/multifd/tcp/plain/zlib", + test_multifd_tcp_zlib); } void migration_test_add_compression(MigrationTestEnv *env) @@ -238,7 +240,4 @@ void migration_test_add_compression(MigrationTestEnv *env) migration_test_add("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle); } - - migration_test_add("/migration/multifd/tcp/plain/zlib", - test_multifd_tcp_zlib); } diff --git a/tests/qtest/migration/cpr-tests.c b/tests/qtest/migration/cpr-tests.c index 905b74f8dc..0edf7011e3 100644 --- a/tests/qtest/migration/cpr-tests.c +++ b/tests/qtest/migration/cpr-tests.c @@ -46,7 +46,8 @@ static void test_mode_reboot(void) void migration_test_add_cpr_smoke(MigrationTestEnv *env) { tmpfs = env->tmpfs; - /* TODO: add smoke tests */ + + /* none for now */ } void migration_test_add_cpr(MigrationTestEnv *env) diff --git a/tests/qtest/migration/misc-tests.c b/tests/qtest/migration/misc-tests.c index 12736e4184..81bd3db610 100644 --- a/tests/qtest/migration/misc-tests.c +++ b/tests/qtest/migration/misc-tests.c @@ -252,14 +252,9 @@ static void test_validate_uri_channels_none_set(void) void migration_test_add_misc_smoke(MigrationTestEnv *env) { tmpfs = env->tmpfs; - /* TODO: add smoke tests */ -} - -void migration_test_add_misc(MigrationTestEnv *env) -{ - migration_test_add_misc_smoke(env); migration_test_add("/migration/bad_dest", test_baddest); + #ifndef _WIN32 migration_test_add("/migration/analyze-script", test_analyze_script); #endif @@ -278,3 +273,8 @@ void migration_test_add_misc(MigrationTestEnv *env) migration_test_add("/migration/validate_uri/channels/none_set", test_validate_uri_channels_none_set); } + +void migration_test_add_misc(MigrationTestEnv *env) +{ + migration_test_add_misc_smoke(env); +} diff --git a/tests/qtest/migration/postcopy-tests.c b/tests/qtest/migration/postcopy-tests.c index d08b61f12f..3860266570 100644 --- a/tests/qtest/migration/postcopy-tests.c +++ b/tests/qtest/migration/postcopy-tests.c @@ -81,19 +81,20 @@ static void test_postcopy_preempt_recovery(void) void migration_test_add_postcopy_smoke(MigrationTestEnv *env) { - /* TODO: add smoke tests */ -} - -void migration_test_add_postcopy(MigrationTestEnv *env) -{ - migration_test_add_postcopy_smoke(env); - if (env->has_uffd) { migration_test_add("/migration/postcopy/plain", test_postcopy); migration_test_add("/migration/postcopy/recovery/plain", test_postcopy_recovery); migration_test_add("/migration/postcopy/preempt/plain", test_postcopy_preempt); + } +} + +void migration_test_add_postcopy(MigrationTestEnv *env) +{ + migration_test_add_postcopy_smoke(env); + + if (env->has_uffd) { migration_test_add("/migration/postcopy/preempt/recovery/plain", test_postcopy_preempt_recovery); migration_test_add("/migration/postcopy/recovery/double-failures/handshake", diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/precopy-tests.c index 743ecf281b..711aa1df79 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -942,12 +942,6 @@ static void test_dirty_limit(void) void migration_test_add_precopy_smoke(MigrationTestEnv *env) { tmpfs = env->tmpfs; - /* TODO: add smoke tests */ -} - -void migration_test_add_precopy(MigrationTestEnv *env) -{ - migration_test_add_precopy_smoke(env); if (env->is_x86) { migration_test_add("/migration/precopy/unix/suspend/live", @@ -960,6 +954,15 @@ void migration_test_add_precopy(MigrationTestEnv *env) test_precopy_unix_plain); migration_test_add("/migration/precopy/tcp/plain", test_precopy_tcp_plain); + migration_test_add("/migration/multifd/tcp/uri/plain/none", + test_multifd_tcp_uri_none); + migration_test_add("/migration/multifd/tcp/plain/cancel", + test_multifd_tcp_cancel); +} + +void migration_test_add_precopy(MigrationTestEnv *env) +{ + migration_test_add_precopy_smoke(env); migration_test_add("/migration/precopy/tcp/plain/switchover-ack", test_precopy_tcp_switchover_ack); @@ -983,16 +986,12 @@ void migration_test_add_precopy(MigrationTestEnv *env) test_dirty_limit); } } - migration_test_add("/migration/multifd/tcp/uri/plain/none", - test_multifd_tcp_uri_none); migration_test_add("/migration/multifd/tcp/channels/plain/none", test_multifd_tcp_channels_none); migration_test_add("/migration/multifd/tcp/plain/zero-page/legacy", test_multifd_tcp_zero_page_legacy); migration_test_add("/migration/multifd/tcp/plain/zero-page/none", test_multifd_tcp_no_zero_page); - migration_test_add("/migration/multifd/tcp/plain/cancel", - test_multifd_tcp_cancel); if (g_str_equal(env->arch, "x86_64") && env->has_kvm && env->has_dirty_ring) { migration_test_add("/migration/dirty_ring", test_precopy_unix_dirty_ring); diff --git a/tests/qtest/migration/tls-tests.c b/tests/qtest/migration/tls-tests.c index e923edbe7b..175217f7d2 100644 --- a/tests/qtest/migration/tls-tests.c +++ b/tests/qtest/migration/tls-tests.c @@ -724,12 +724,15 @@ static void test_multifd_tcp_tls_x509_reject_anon_client(void) void migration_test_add_tls_smoke(MigrationTestEnv *env) { tmpfs = env->tmpfs; - /* TODO: add smoke tests */ + + migration_test_add("/migration/precopy/tcp/tls/psk/match", + test_precopy_tcp_tls_psk_match); } void migration_test_add_tls(MigrationTestEnv *env) { migration_test_add_tls_smoke(env); + migration_test_add("/migration/precopy/unix/tls/psk", test_precopy_unix_tls_psk); @@ -755,8 +758,6 @@ void migration_test_add_tls(MigrationTestEnv *env) test_precopy_unix_tls_x509_override_host); #endif /* CONFIG_TASN1 */ - migration_test_add("/migration/precopy/tcp/tls/psk/match", - test_precopy_tcp_tls_psk_match); migration_test_add("/migration/precopy/tcp/tls/psk/mismatch", test_precopy_tcp_tls_psk_mismatch); #ifdef CONFIG_TASN1