tests/qtest/migration: Use defer for cpr-tests
Signed-off-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Peter Xu <peterx@redhat.com> Link: https://lore.kernel.org/r/20260505160915.25558-12-farosas@suse.de Signed-off-by: Peter Xu <peterx@redhat.com>
Fabiano Rosas committed
May 5, 2026 at 13:09 UTC
f9adc0e3e91b9044b461137b590ced9475ad6383
1 file changed
+12
-9
tests/qtest/migration/cpr-tests.c
+12
-9
@@ -60,7 +60,7 @@ static int test_transfer(MigrateCommon *args, const char *cpr_channel,
60
obj = migrate_str_to_channel(cpr_channel);
61
qlist_append(channels_list, obj);
62
63
- if (migrate_start(&from, &to, args->listen_uri, &args->start)) {
63
+ if (migrate_start(&from, &to, "defer", &args->start)) {
64
return -1;
65
}
66
@@ -128,11 +128,17 @@ static void test_mode_transfer_common(MigrateCommon *args, bool incoming_defer)
128
int cpr_sockfd = qtest_socket_server(cpr_path);
129
g_assert(cpr_sockfd >= 0);
130
131
- opts_target = g_strdup_printf("-incoming cpr,addr.transport=socket,"
132
- "addr.type=fd,addr.str=%d %s",
133
- cpr_sockfd, opts);
131
+ if (incoming_defer) {
132
+ opts_target = g_strdup_printf("-incoming cpr,addr.transport=socket,"
133
+ "addr.type=fd,addr.str=%d %s",
134
+ cpr_sockfd, opts);
135
+ } else {
136
+ opts_target = g_strdup_printf("-incoming %s "
137
+ "-incoming cpr,addr.transport=socket,"
138
+ "addr.type=fd,addr.str=%d %s",
139
+ uri, cpr_sockfd, opts);
140
+ }
141
135
- args->listen_uri = incoming_defer ? "defer" : uri;
142
args->connect_channels = connect_channels;
143
144
args->start.opts_source = opts;
@@ -224,7 +230,7 @@ static void test_cpr_exec(MigrateCommon *args)
230
g_autofree char *filename = g_strdup_printf("%s/%s", tmpfs,
231
FILE_TEST_FILENAME);
232
227
- if (migrate_start(&from, NULL, args->listen_uri, &args->start)) {
233
+ if (migrate_start(&from, NULL, "defer", &args->start)) {
234
return;
235
}
236
@@ -274,10 +280,7 @@ static void test_mode_exec(char *name, MigrateCommon *args)
280
{
281
g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
282
FILE_TEST_FILENAME);
277
- g_autofree char *listen_uri = g_strdup_printf("defer");
278
-
283
args->connect_uri = uri;
280
- args->listen_uri = listen_uri;
284
args->start_hook = test_mode_exec_start;
285
286
args->start.only_source = true;