Browse Source

tests: let qapi-schema tests detect oob

The allow_oob parameter was passed in but not used in tests.  Now
reflect that in the tests, so we need to touch up other command testers
with that new change.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180326063901.27425-6-peterx@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Peter Xu 7 years ago
parent
commit
4bebca1e42

+ 2 - 2
tests/qapi-schema/doc-good.out

@@ -28,9 +28,9 @@ object q_obj_cmd-arg
     member arg2: str optional=True
     member arg2: str optional=True
     member arg3: bool optional=False
     member arg3: bool optional=False
 command cmd q_obj_cmd-arg -> Object
 command cmd q_obj_cmd-arg -> Object
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False
 command cmd-boxed Object -> None
 command cmd-boxed Object -> None
-   gen=True success_response=True boxed=True
+   gen=True success_response=True boxed=True oob=False
 doc freeform
 doc freeform
     body=
     body=
 = Section
 = Section

+ 1 - 1
tests/qapi-schema/ident-with-escape.out

@@ -5,4 +5,4 @@ module ident-with-escape.json
 object q_obj_fooA-arg
 object q_obj_fooA-arg
     member bar1: str optional=False
     member bar1: str optional=False
 command fooA q_obj_fooA-arg -> None
 command fooA q_obj_fooA-arg -> None
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False

+ 2 - 2
tests/qapi-schema/indented-expr.out

@@ -3,6 +3,6 @@ enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']
     prefix QTYPE
     prefix QTYPE
 module indented-expr.json
 module indented-expr.json
 command eins None -> None
 command eins None -> None
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False
 command zwei None -> None
 command zwei None -> None
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False

+ 9 - 9
tests/qapi-schema/qapi-schema-test.out

@@ -16,7 +16,7 @@ object Empty1
 object Empty2
 object Empty2
     base Empty1
     base Empty1
 command user_def_cmd0 Empty2 -> Empty2
 command user_def_cmd0 Empty2 -> Empty2
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False
 enum QEnumTwo ['value1', 'value2']
 enum QEnumTwo ['value1', 'value2']
     prefix QENUM_TWO
     prefix QENUM_TWO
 object UserDefOne
 object UserDefOne
@@ -143,29 +143,29 @@ object UserDefNativeListUnion
     case sizes: q_obj_sizeList-wrapper
     case sizes: q_obj_sizeList-wrapper
     case any: q_obj_anyList-wrapper
     case any: q_obj_anyList-wrapper
 command user_def_cmd None -> None
 command user_def_cmd None -> None
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False
 object q_obj_user_def_cmd1-arg
 object q_obj_user_def_cmd1-arg
     member ud1a: UserDefOne optional=False
     member ud1a: UserDefOne optional=False
 command user_def_cmd1 q_obj_user_def_cmd1-arg -> None
 command user_def_cmd1 q_obj_user_def_cmd1-arg -> None
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False
 object q_obj_user_def_cmd2-arg
 object q_obj_user_def_cmd2-arg
     member ud1a: UserDefOne optional=False
     member ud1a: UserDefOne optional=False
     member ud1b: UserDefOne optional=True
     member ud1b: UserDefOne optional=True
 command user_def_cmd2 q_obj_user_def_cmd2-arg -> UserDefTwo
 command user_def_cmd2 q_obj_user_def_cmd2-arg -> UserDefTwo
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False
 object q_obj_guest-get-time-arg
 object q_obj_guest-get-time-arg
     member a: int optional=False
     member a: int optional=False
     member b: int optional=True
     member b: int optional=True
 command guest-get-time q_obj_guest-get-time-arg -> int
 command guest-get-time q_obj_guest-get-time-arg -> int
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False
 object q_obj_guest-sync-arg
 object q_obj_guest-sync-arg
     member arg: any optional=False
     member arg: any optional=False
 command guest-sync q_obj_guest-sync-arg -> any
 command guest-sync q_obj_guest-sync-arg -> any
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False
 command boxed-struct UserDefZero -> None
 command boxed-struct UserDefZero -> None
-   gen=True success_response=True boxed=True
+   gen=True success_response=True boxed=True oob=False
 command boxed-union UserDefNativeListUnion -> None
 command boxed-union UserDefNativeListUnion -> None
-   gen=True success_response=True boxed=True
+   gen=True success_response=True boxed=True oob=False
 object UserDefOptions
 object UserDefOptions
     member i64: intList optional=True
     member i64: intList optional=True
     member u64: uint64List optional=True
     member u64: uint64List optional=True
@@ -229,4 +229,4 @@ object q_obj___org.qemu_x-command-arg
     member c: __org.qemu_x-Union2 optional=False
     member c: __org.qemu_x-Union2 optional=False
     member d: __org.qemu_x-Alt 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
 command __org.qemu_x-command q_obj___org.qemu_x-command-arg -> __org.qemu_x-Union1
-   gen=True success_response=True boxed=False
+   gen=True success_response=True boxed=False oob=False

+ 2 - 2
tests/qapi-schema/test-qapi.py

@@ -45,8 +45,8 @@ def visit_command(self, name, info, arg_type, ret_type,
                       gen, success_response, boxed, allow_oob):
                       gen, success_response, boxed, allow_oob):
         print('command %s %s -> %s' % \
         print('command %s %s -> %s' % \
               (name, arg_type and arg_type.name, ret_type and ret_type.name))
               (name, arg_type and arg_type.name, ret_type and ret_type.name))
-        print('   gen=%s success_response=%s boxed=%s' % \
-              (gen, success_response, boxed))
+        print('   gen=%s success_response=%s boxed=%s oob=%s' % \
+              (gen, success_response, boxed, allow_oob))
 
 
     def visit_event(self, name, info, arg_type, boxed):
     def visit_event(self, name, info, arg_type, boxed):
         print('event %s %s' % (name, arg_type and arg_type.name))
         print('event %s %s' % (name, arg_type and arg_type.name))