[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/10] tests/qtest: get rid of 'qmp_command' helper in migration t
From: |
Juan Quintela |
Subject: |
[PULL 03/10] tests/qtest: get rid of 'qmp_command' helper in migration test |
Date: |
Fri, 2 Jun 2023 12:49:03 +0200 |
From: Daniel P. Berrangé <berrange@redhat.com>
This function duplicates logic of qtest_qmp_assert_success_ref.
The qtest_qmp_assert_success_ref method has better diagnostics
on failure because it prints the entire QMP response, instead
of just asserting on existance of the 'error' key.
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230601161347.1803440-4-berrange@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/qtest/migration-helpers.h | 3 ---
tests/qtest/migration-helpers.c | 22 ----------------------
tests/qtest/migration-test.c | 29 +++++++++++++++--------------
3 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h
index a188b62787..2e51a6e195 100644
--- a/tests/qtest/migration-helpers.h
+++ b/tests/qtest/migration-helpers.h
@@ -25,9 +25,6 @@ QDict *wait_command_fd(QTestState *who, int fd, const char
*command, ...);
G_GNUC_PRINTF(2, 3)
QDict *wait_command(QTestState *who, const char *command, ...);
-G_GNUC_PRINTF(2, 3)
-QDict *qmp_command(QTestState *who, const char *command, ...);
-
G_GNUC_PRINTF(3, 4)
void migrate_qmp(QTestState *who, const char *uri, const char *fmt, ...);
diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c
index f6f3c6680f..bddf3f8d4d 100644
--- a/tests/qtest/migration-helpers.c
+++ b/tests/qtest/migration-helpers.c
@@ -85,28 +85,6 @@ QDict *wait_command(QTestState *who, const char *command,
...)
return ret;
}
-/*
- * Execute the qmp command only
- */
-QDict *qmp_command(QTestState *who, const char *command, ...)
-{
- va_list ap;
- QDict *resp, *ret;
-
- va_start(ap, command);
- resp = qtest_vqmp(who, command, ap);
- va_end(ap);
-
- g_assert(!qdict_haskey(resp, "error"));
- g_assert(qdict_haskey(resp, "return"));
-
- ret = qdict_get_qdict(resp, "return");
- qobject_ref(ret);
- qobject_unref(resp);
-
- return ret;
-}
-
/*
* Send QMP command "migrate".
* Arguments are built from @fmt... (formatted like
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index b99b49a314..9ce27f89ec 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -2322,32 +2322,33 @@ static void test_multifd_tcp_cancel(void)
static void calc_dirty_rate(QTestState *who, uint64_t calc_time)
{
- qobject_unref(qmp_command(who,
- "{ 'execute': 'calc-dirty-rate',"
- "'arguments': { "
- "'calc-time': %" PRIu64 ","
- "'mode': 'dirty-ring' }}",
- calc_time));
+ qtest_qmp_assert_success(who,
+ "{ 'execute': 'calc-dirty-rate',"
+ "'arguments': { "
+ "'calc-time': %" PRIu64 ","
+ "'mode': 'dirty-ring' }}",
+ calc_time);
}
static QDict *query_dirty_rate(QTestState *who)
{
- return qmp_command(who, "{ 'execute': 'query-dirty-rate' }");
+ return qtest_qmp_assert_success_ref(who,
+ "{ 'execute': 'query-dirty-rate' }");
}
static void dirtylimit_set_all(QTestState *who, uint64_t dirtyrate)
{
- qobject_unref(qmp_command(who,
- "{ 'execute': 'set-vcpu-dirty-limit',"
- "'arguments': { "
- "'dirty-rate': %" PRIu64 " } }",
- dirtyrate));
+ qtest_qmp_assert_success(who,
+ "{ 'execute': 'set-vcpu-dirty-limit',"
+ "'arguments': { "
+ "'dirty-rate': %" PRIu64 " } }",
+ dirtyrate);
}
static void cancel_vcpu_dirty_limit(QTestState *who)
{
- qobject_unref(qmp_command(who,
- "{ 'execute': 'cancel-vcpu-dirty-limit' }"));
+ qtest_qmp_assert_success(who,
+ "{ 'execute': 'cancel-vcpu-dirty-limit' }");
}
static QDict *query_vcpu_dirty_limit(QTestState *who)
--
2.40.1
- [PULL 00/10] Migration 20230602 patches, Juan Quintela, 2023/06/02
- [PULL 01/10] tests/qtest: add various qtest_qmp_assert_success() variants, Juan Quintela, 2023/06/02
- [PULL 02/10] tests/qtest: add support for callback to receive QMP events, Juan Quintela, 2023/06/02
- [PULL 04/10] tests/qtest: get rid of some 'qtest_qmp' usage in migration test, Juan Quintela, 2023/06/02
- [PULL 07/10] tests/qtest: capture RESUME events during migration, Juan Quintela, 2023/06/02
- [PULL 06/10] tests/qtest: replace wait_command() with qtest_qmp_assert_success, Juan Quintela, 2023/06/02
- [PULL 08/10] tests/qtest: distinguish src/dst migration VM stop/resume events, Juan Quintela, 2023/06/02
- [PULL 10/10] qtest/migration: Document live=true cases, Juan Quintela, 2023/06/02
- [PULL 09/10] tests/qtest: make more migration pre-copy scenarios run non-live, Juan Quintela, 2023/06/02
- [PULL 05/10] tests/qtest: switch to using event callbacks for STOP event, Juan Quintela, 2023/06/02
- [PULL 03/10] tests/qtest: get rid of 'qmp_command' helper in migration test,
Juan Quintela <=
- Re: [PULL 00/10] Migration 20230602 patches, Richard Henderson, 2023/06/02