[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.13 v5 08/11] tests: extend qmp test with preco
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH for-2.13 v5 08/11] tests: extend qmp test with preconfig checks |
Date: |
Thu, 5 Apr 2018 11:05:10 +0200 |
Add permission checks for commands at 'preconfig' stage.
Signed-off-by: Igor Mammedov <address@hidden>
---
v5:
* s/-preconfig/--preconfig/
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 772058f..8bba913 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -392,6 +392,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;
@@ -403,6 +446,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.7.4
- [Qemu-devel] [PATCH for-2.13 v5 01/11] numa: postpone options post-processing till machine_run_board_init(), (continued)
- [Qemu-devel] [PATCH for-2.13 v5 01/11] numa: postpone options post-processing till machine_run_board_init(), Igor Mammedov, 2018/04/05
- [Qemu-devel] [PATCH for-2.13 v5 04/11] hmp: disable monitor in preconfig state, Igor Mammedov, 2018/04/05
- [Qemu-devel] [PATCH for-2.13 v5 07/11] tests: add allowed-in-preconfig-test for qapi-schema, Igor Mammedov, 2018/04/05
- [Qemu-devel] [PATCH for-2.13 v5 05/11] qapi: introduce new cmd option "allowed-in-preconfig", Igor Mammedov, 2018/04/05
- [Qemu-devel] [PATCH for-2.13 v5 03/11] cli: add --preconfig option, Igor Mammedov, 2018/04/05
- [Qemu-devel] [PATCH for-2.13 v5 09/11] qmp: permit query-hotpluggable-cpus in preconfig state, Igor Mammedov, 2018/04/05
- [Qemu-devel] [PATCH for-2.13 v5 06/11] tests: let qapi-schema tests detect allowed-in-preconfig, Igor Mammedov, 2018/04/05
- [Qemu-devel] [PATCH for-2.13 v5 11/11] tests: functional tests for QMP command set-numa-node, Igor Mammedov, 2018/04/05
- [Qemu-devel] [PATCH for-2.13 v5 10/11] qmp: add set-numa-node command, Igor Mammedov, 2018/04/05
- [Qemu-devel] [PATCH for-2.13 v5 02/11] numa: split out NumaOptions parsing into set_numa_options(), Igor Mammedov, 2018/04/05
- [Qemu-devel] [PATCH for-2.13 v5 08/11] tests: extend qmp test with preconfig checks,
Igor Mammedov <=