提交 7e1d7427 编写于 作者: P Peter Xu 提交者: Dr. David Alan Gilbert

tests: allow migrate() to take extra flags

For example, we can pass in '"resume": true' to resume a migration.
Reviewed-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: NJuan Quintela <quintela@redhat.com>
Reviewed-by: NBalamuruhan S <bala24@linux.vnet.ibm.com>
Signed-off-by: NPeter Xu <peterx@redhat.com>
Message-Id: <20180710091902.28780-7-peterx@redhat.com>
Signed-off-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
上级 d131662a
......@@ -337,14 +337,14 @@ static void migrate_set_capability(QTestState *who, const char *capability,
qobject_unref(rsp);
}
static void migrate(QTestState *who, const char *uri)
static void migrate(QTestState *who, const char *uri, const char *extra)
{
QDict *rsp;
gchar *cmd;
cmd = g_strdup_printf("{ 'execute': 'migrate',"
"'arguments': { 'uri': '%s' } }",
uri);
" 'arguments': { 'uri': '%s' %s } }",
uri, extra ? extra : "");
rsp = qtest_qmp(who, cmd);
g_free(cmd);
g_assert(qdict_haskey(rsp, "return"));
......@@ -540,7 +540,7 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
/* Wait for the first serial output from the source */
wait_for_serial("src_serial");
migrate(from, uri);
migrate(from, uri, NULL);
g_free(uri);
wait_for_migration_pass(from);
......@@ -586,7 +586,7 @@ static void test_baddest(void)
if (test_migrate_start(&from, &to, "tcp:0:0", true)) {
return;
}
migrate(from, "tcp:0:0");
migrate(from, "tcp:0:0", NULL);
do {
rsp = wait_command(from, "{ 'execute': 'query-migrate' }");
rsp_return = qdict_get_qdict(rsp, "return");
......@@ -630,7 +630,7 @@ static void test_precopy_unix(void)
/* Wait for the first serial output from the source */
wait_for_serial("src_serial");
migrate(from, uri);
migrate(from, uri, NULL);
wait_for_migration_pass(from);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册