[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.13 v5 06/11] tests: let qapi-schema tests dete
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH for-2.13 v5 06/11] tests: let qapi-schema tests detect allowed-in-preconfig |
Date: |
Thu, 5 Apr 2018 11:05:08 +0200 |
use new allowed-in-preconfig parameter in tests.
Signed-off-by: Igor Mammedov <address@hidden>
---
tests/qapi-schema/doc-good.out | 4 ++--
tests/qapi-schema/ident-with-escape.out | 2 +-
tests/qapi-schema/indented-expr.out | 4 ++--
tests/qapi-schema/qapi-schema-test.out | 20 ++++++++++----------
tests/qapi-schema/test-qapi.py | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/tests/qapi-schema/doc-good.out b/tests/qapi-schema/doc-good.out
index 63058b1..9c8a483 100644
--- a/tests/qapi-schema/doc-good.out
+++ b/tests/qapi-schema/doc-good.out
@@ -28,9 +28,9 @@ object q_obj_cmd-arg
member arg2: str optional=True
member arg3: bool optional=False
command cmd q_obj_cmd-arg -> Object
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
command cmd-boxed Object -> None
- gen=True success_response=True boxed=True oob=False
+ gen=True success_response=True boxed=True oob=False preconfig=False
doc freeform
body=
= Section
diff --git a/tests/qapi-schema/ident-with-escape.out
b/tests/qapi-schema/ident-with-escape.out
index 82213aa..24c976f 100644
--- a/tests/qapi-schema/ident-with-escape.out
+++ b/tests/qapi-schema/ident-with-escape.out
@@ -5,4 +5,4 @@ module ident-with-escape.json
object q_obj_fooA-arg
member bar1: str optional=False
command fooA q_obj_fooA-arg -> None
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
diff --git a/tests/qapi-schema/indented-expr.out
b/tests/qapi-schema/indented-expr.out
index 862678f..bd8a486 100644
--- a/tests/qapi-schema/indented-expr.out
+++ b/tests/qapi-schema/indented-expr.out
@@ -3,6 +3,6 @@ enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict',
'qlist', 'qbool']
prefix QTYPE
module indented-expr.json
command eins None -> None
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
command zwei None -> None
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index 467577d..1f5038f 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -16,7 +16,7 @@ object Empty1
object Empty2
base Empty1
command user_def_cmd0 Empty2 -> Empty2
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
enum QEnumTwo ['value1', 'value2']
prefix QENUM_TWO
object UserDefOne
@@ -143,31 +143,31 @@ object UserDefNativeListUnion
case sizes: q_obj_sizeList-wrapper
case any: q_obj_anyList-wrapper
command user_def_cmd None -> None
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
object q_obj_user_def_cmd1-arg
member ud1a: UserDefOne optional=False
command user_def_cmd1 q_obj_user_def_cmd1-arg -> None
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
object q_obj_user_def_cmd2-arg
member ud1a: UserDefOne optional=False
member ud1b: UserDefOne optional=True
command user_def_cmd2 q_obj_user_def_cmd2-arg -> UserDefTwo
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
object q_obj_guest-get-time-arg
member a: int optional=False
member b: int optional=True
command guest-get-time q_obj_guest-get-time-arg -> int
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
object q_obj_guest-sync-arg
member arg: any optional=False
command guest-sync q_obj_guest-sync-arg -> any
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
command boxed-struct UserDefZero -> None
- gen=True success_response=True boxed=True oob=False
+ gen=True success_response=True boxed=True oob=False preconfig=False
command boxed-union UserDefNativeListUnion -> None
- gen=True success_response=True boxed=True oob=False
+ gen=True success_response=True boxed=True oob=False preconfig=False
command an-oob-command None -> None
- gen=True success_response=True boxed=False oob=True
+ gen=True success_response=True boxed=False oob=True preconfig=False
object UserDefOptions
member i64: intList optional=True
member u64: uint64List optional=True
@@ -231,4 +231,4 @@ object q_obj___org.qemu_x-command-arg
member c: __org.qemu_x-Union2 optional=False
member d: __org.qemu_x-Alt optional=False
command __org.qemu_x-command q_obj___org.qemu_x-command-arg ->
__org.qemu_x-Union1
- gen=True success_response=True boxed=False oob=False
+ gen=True success_response=True boxed=False oob=False preconfig=False
diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py
index 73d2c77..f0ff701 100644
--- a/tests/qapi-schema/test-qapi.py
+++ b/tests/qapi-schema/test-qapi.py
@@ -45,8 +45,8 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):
success_response, boxed, allow_oob,
allowed_in_preconfig):
print('command %s %s -> %s' % \
(name, arg_type and arg_type.name, ret_type and ret_type.name))
- print(' gen=%s success_response=%s boxed=%s oob=%s' % \
- (gen, success_response, boxed, allow_oob))
+ print(' gen=%s success_response=%s boxed=%s oob=%s preconfig=%s' % \
+ (gen, success_response, boxed, allow_oob, allowed_in_preconfig))
def visit_event(self, name, info, arg_type, boxed):
print('event %s %s' % (name, arg_type and arg_type.name))
--
2.7.4
- [Qemu-devel] [PATCH for-2.13 v5 00/11] enable numa configuration before machine_init() from QMP, Igor Mammedov, 2018/04/05
- [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 <=
- [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, 2018/04/05