From: Fabiano Rosas <farosas@suse.de>
Remove some repetition when defining unix: tests by introducing a
_common function.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/r/20260505160915.25558-5-farosas@suse.de
Signed-off-by: Peter Xu <peterx@redhat.com>
---
tests/qtest/migration/framework.h | 1 +
tests/qtest/migration/compression-tests.c | 6 +----
tests/qtest/migration/framework.c | 9 +++++++
tests/qtest/migration/precopy-tests.c | 30 +++--------------------
tests/qtest/migration/tls-tests.c | 12 ++-------
5 files changed, 17 insertions(+), 41 deletions(-)
diff --git a/tests/qtest/migration/framework.h b/tests/qtest/migration/framework.h
index 3ccc6a99d2..825209ee74 100644
--- a/tests/qtest/migration/framework.h
+++ b/tests/qtest/migration/framework.h
@@ -240,6 +240,7 @@ void test_postcopy_common(MigrateCommon *args);
void test_postcopy_recovery_common(MigrateCommon *args,
PostcopyRecoveryFailStage fail_stage);
int test_precopy_common(MigrateCommon *args);
+void test_precopy_unix_common(MigrateCommon *args);
void test_file_common(MigrateCommon *args, bool stop_src);
void *migrate_hook_start_precopy_tcp_multifd_common(QTestState *from,
QTestState *to,
diff --git a/tests/qtest/migration/compression-tests.c b/tests/qtest/migration/compression-tests.c
index 845e622cd5..7f2856b7f8 100644
--- a/tests/qtest/migration/compression-tests.c
+++ b/tests/qtest/migration/compression-tests.c
@@ -123,10 +123,6 @@ migrate_hook_start_xbzrle(QTestState *from,
static void test_precopy_unix_xbzrle(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
-
- args->connect_uri = uri;
- args->listen_uri = uri;
args->start_hook = migrate_hook_start_xbzrle;
args->iterations = 2;
/*
@@ -137,7 +133,7 @@ static void test_precopy_unix_xbzrle(char *name, MigrateCommon *args)
args->start.caps[MIGRATION_CAPABILITY_XBZRLE] = true;
- test_precopy_common(args);
+ test_precopy_unix_common(args);
}
static void *
diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/framework.c
index 3802c6f57d..1d13b897a9 100644
--- a/tests/qtest/migration/framework.c
+++ b/tests/qtest/migration/framework.c
@@ -934,6 +934,15 @@ finish:
return 0;
}
+void test_precopy_unix_common(MigrateCommon *args)
+{
+ g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
+
+ args->listen_uri = uri;
+ args->connect_uri = uri;
+ test_precopy_common(args);
+}
+
static void file_dirty_offset_region(void)
{
g_autofree char *path = g_strdup_printf("%s/%s", tmpfs, FILE_TEST_FILENAME);
diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/precopy-tests.c
index 0426319199..849aef3ed6 100644
--- a/tests/qtest/migration/precopy-tests.c
+++ b/tests/qtest/migration/precopy-tests.c
@@ -37,62 +37,40 @@ static char *tmpfs;
static void test_precopy_unix_plain(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
-
- args->listen_uri = uri;
- args->connect_uri = uri;
/*
* The simplest use case of precopy, covering smoke tests of
* get-dirty-log dirty tracking.
*/
args->live = true;
-
- test_precopy_common(args);
+ test_precopy_unix_common(args);
}
static void test_precopy_unix_suspend_live(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
-
- args->listen_uri = uri;
- args->connect_uri = uri;
/*
* despite being live, the test is fast because the src
* suspends immediately.
*/
args->live = true;
-
args->start.suspend_me = true;
-
- test_precopy_common(args);
+ test_precopy_unix_common(args);
}
static void test_precopy_unix_suspend_notlive(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
-
- args->listen_uri = uri;
- args->connect_uri = uri;
args->start.suspend_me = true;
-
- test_precopy_common(args);
+ test_precopy_unix_common(args);
}
static void test_precopy_unix_dirty_ring(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
-
- args->listen_uri = uri;
- args->connect_uri = uri;
/*
* Besides the precopy/unix basic test, cover dirty ring interface
* rather than get-dirty-log.
*/
args->live = true;
-
args->start.use_dirty_ring = true;
-
- test_precopy_common(args);
+ test_precopy_unix_common(args);
}
#ifdef CONFIG_RDMA
diff --git a/tests/qtest/migration/tls-tests.c b/tests/qtest/migration/tls-tests.c
index 87898af260..0677ca661e 100644
--- a/tests/qtest/migration/tls-tests.c
+++ b/tests/qtest/migration/tls-tests.c
@@ -424,14 +424,10 @@ static void test_multifd_postcopy_preempt_recovery_tls_psk(char *name,
static void test_precopy_unix_tls_psk(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
-
- args->connect_uri = uri;
- args->listen_uri = uri;
args->start_hook = migrate_hook_start_tls_psk_match;
args->end_hook = migrate_hook_end_tls_psk;
- test_precopy_common(args);
+ test_precopy_unix_common(args);
}
#ifdef CONFIG_TASN1
@@ -454,14 +450,10 @@ static void test_precopy_unix_tls_x509_default_host(char *name,
static void test_precopy_unix_tls_x509_override_host(char *name,
MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
-
- args->connect_uri = uri;
- args->listen_uri = uri;
args->start_hook = migrate_hook_start_tls_x509_override_host;
args->end_hook = migrate_hook_end_tls_x509;
- test_precopy_common(args);
+ test_precopy_unix_common(args);
}
#endif /* CONFIG_TASN1 */
--
2.53.0