Choose a few tests per group and move them from the full set to the
smoke set.
Signed-off-by: Fabiano Rosas <faro...@suse.de>
---
tests/qtest/migration/compression-tests.c | 7 +++----
tests/qtest/migration/cpr-tests.c | 3 ++-
tests/qtest/migration/misc-tests.c | 11 +++++------
tests/qtest/migration/postcopy-tests.c | 15 ++++++++-------
tests/qtest/migration/precopy-tests.c | 19 +++++++++----------
tests/qtest/migration/tls-tests.c | 7 ++++---
6 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/tests/qtest/migration/compression-tests.c
b/tests/qtest/migration/compression-tests.c
index b48dc87239..353b7ccbdd 100644
--- a/tests/qtest/migration/compression-tests.c
+++ b/tests/qtest/migration/compression-tests.c
@@ -208,7 +208,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)
@@ -239,7 +241,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 4fe6eefe86..c5cad2a20c 100644
--- a/tests/qtest/migration/cpr-tests.c
+++ b/tests/qtest/migration/cpr-tests.c
@@ -47,7 +47,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 480fbda1c9..ee737c3942 100644
--- a/tests/qtest/migration/misc-tests.c
+++ b/tests/qtest/migration/misc-tests.c
@@ -253,12 +253,6 @@ 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
@@ -279,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 90d2d0820c..36ef05caa0 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);
diff --git a/tests/qtest/migration/precopy-tests.c
b/tests/qtest/migration/precopy-tests.c
index 393c7e226a..4a5e7f41a9 100644
--- a/tests/qtest/migration/precopy-tests.c
+++ b/tests/qtest/migration/precopy-tests.c
@@ -949,12 +949,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",
@@ -967,6 +961,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);
@@ -990,16 +993,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) {
diff --git a/tests/qtest/migration/tls-tests.c
b/tests/qtest/migration/tls-tests.c
index 264b54f352..37b5b64692 100644
--- a/tests/qtest/migration/tls-tests.c
+++ b/tests/qtest/migration/tls-tests.c
@@ -725,12 +725,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);
@@ -756,8 +759,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
--
2.35.3
