[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 6/9] tests: extend qmp test with preconfig checks
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v4 6/9] tests: extend qmp test with preconfig checks |
Date: |
Mon, 12 Mar 2018 14:11:12 +0100 |
Add permission checks for commands at 'preconfig' stage.
Signed-off-by: Igor Mammedov <address@hidden>
---
v4:
* s/is_err()/qmp_rsp_is_err()/
* return true even if 'error' doesn't contain 'desc'
(Eric Blake <address@hidden>)
---
tests/qmp-test.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index 22445d9..cff880f 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -305,6 +305,49 @@ static void add_query_tests(QmpSchema *schema)
}
}
+static bool qmp_rsp_is_err(QDict *rsp)
+{
+ QDict *error = qdict_get_qdict(rsp, "error");
+ QDECREF(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");
+ QDECREF(rsp);
+
+ /* exit preconfig state */
+ g_assert(!qmp_rsp_is_err(qtest_qmp(qs, "{ 'execute': 'cont' }")));
+ 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");
+ QDECREF(rsp);
+
+ /* 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;
@@ -315,6 +358,7 @@ int main(int argc, char *argv[])
qtest_add_func("qmp/protocol", test_qmp_protocol);
qmp_schema_init(&schema);
add_query_tests(&schema);
+ qtest_add_func("qmp/preconfig", test_qmp_preconfig);
ret = g_test_run();
--
2.7.4
- [Qemu-devel] [PATCH v4 0/9] enable numa configuration before machine_init() from QMP, Igor Mammedov, 2018/03/12
- [Qemu-devel] [PATCH v4 2/9] numa: split out NumaOptions parsing into parse_NumaOptions(), Igor Mammedov, 2018/03/12
- [Qemu-devel] [PATCH v4 4/9] hmp: disable monitor in preconfig state, Igor Mammedov, 2018/03/12
- [Qemu-devel] [PATCH v4 1/9] numa: postpone options post-processing till machine_run_board_init(), Igor Mammedov, 2018/03/12
- [Qemu-devel] [PATCH v4 3/9] cli: add -preconfig option, Igor Mammedov, 2018/03/12
- [Qemu-devel] [PATCH v4 5/9] qapi: introduce new cmd option "allowed-in-preconfig", Igor Mammedov, 2018/03/12
- [Qemu-devel] [PATCH v4 8/9] qmp: add set-numa-node command, Igor Mammedov, 2018/03/12
- [Qemu-devel] [PATCH v4 9/9] tests: functional tests for QMP command set-numa-node, Igor Mammedov, 2018/03/12
- [Qemu-devel] [PATCH v4 7/9] qmp: permit query-hotpluggable-cpus in preconfig state, Igor Mammedov, 2018/03/12
- [Qemu-devel] [PATCH v4 6/9] tests: extend qmp test with preconfig checks,
Igor Mammedov <=