[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/12] tests: extend qmp test with preconfig checks
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 09/12] tests: extend qmp test with preconfig checks |
Date: |
Wed, 30 May 2018 20:05:25 -0300 |
From: Igor Mammedov <address@hidden>
Add permission checks for commands at 'preconfig' stage.
Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
tests/qmp-test.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index 88f867f8c0..2ee441cdb3 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -392,6 +392,52 @@ static void add_query_tests(QmpSchema *schema)
}
}
+static bool qmp_rsp_is_err(QDict *rsp)
+{
+ QDict *error = qdict_get_qdict(rsp, "error");
+ qobject_unref(rsp);
+ return !!error;
+}
+
+static void test_qmp_preconfig(void)
+{
+ QDict *rsp, *ret;
+ QTestState *qs = qtest_startf("%s --preconfig", common_args);
+
+ /* preconfig state */
+ /* enabled commands, no error expected */
+ g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'query-commands'
}")));
+
+ /* forbidden commands, expected error */
+ g_assert(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'query-cpus' }")));
+
+ /* check that query-status returns preconfig state */
+ rsp = qtest_qmp(qs, "{ 'execute': 'query-status' }");
+ ret = qdict_get_qdict(rsp, "return");
+ g_assert(ret);
+ g_assert_cmpstr(qdict_get_try_str(ret, "status"), ==, "preconfig");
+ qobject_unref(rsp);
+
+ /* exit preconfig state */
+ g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'exit-preconfig'
}")));
+ qtest_qmp_eventwait(qs, "RESUME");
+
+ /* check that query-status returns running state */
+ rsp = qtest_qmp(qs, "{ 'execute': 'query-status' }");
+ ret = qdict_get_qdict(rsp, "return");
+ g_assert(ret);
+ g_assert_cmpstr(qdict_get_try_str(ret, "status"), ==, "running");
+ qobject_unref(rsp);
+
+ /* check that exit-preconfig returns error after exiting preconfig */
+ g_assert(qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'exit-preconfig' }")));
+
+ /* enabled commands, no error expected */
+ g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'query-cpus' }")));
+
+ qtest_quit(qs);
+}
+
int main(int argc, char *argv[])
{
QmpSchema schema;
@@ -403,6 +449,7 @@ int main(int argc, char *argv[])
qtest_add_func("qmp/oob", test_qmp_oob);
qmp_schema_init(&schema);
add_query_tests(&schema);
+ qtest_add_func("qmp/preconfig", test_qmp_preconfig);
ret = g_test_run();
--
2.17.1
- [Qemu-devel] [PULL 00/12] NUMA queue, 2018-05-30, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 01/12] numa: clarify error message when node index is out of range in -numa dist, ..., Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 02/12] numa: postpone options post-processing till machine_run_board_init(), Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 03/12] numa: split out NumaOptions parsing into set_numa_options(), Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 04/12] qapi: introduce preconfig runstate, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 05/12] hmp: disable monitor in preconfig state, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 06/12] qapi: introduce new cmd option "allow-preconfig", Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 07/12] tests: qapi-schema tests for allow-preconfig, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 09/12] tests: extend qmp test with preconfig checks,
Eduardo Habkost <=
- [Qemu-devel] [PULL 08/12] cli: add --preconfig option, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 10/12] qmp: permit query-hotpluggable-cpus in preconfig state, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 11/12] qmp: add set-numa-node command, Eduardo Habkost, 2018/05/30
- [Qemu-devel] [PULL 12/12] tests: functional tests for QMP command set-numa-node, Eduardo Habkost, 2018/05/30
- Re: [Qemu-devel] [PULL 00/12] NUMA queue, 2018-05-30, Peter Maydell, 2018/05/31