Commit 4bebca1e authored by Peter Xu's avatar Peter Xu Committed by Eric Blake
Browse files

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: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20180326063901.27425-6-peterx@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 94088601

tests/qapi-schema/doc-good.out

+2 −2
Original line number Diff line number Diff line
@@ -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

   gen=True success_response=True boxed=False oob=False

command cmd-boxed Object -> None

   gen=True success_response=True boxed=True

   gen=True success_response=True boxed=True oob=False

doc freeform

    body=

= Section

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

+1 −1
Original line number Diff line number Diff line
@@ -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
 
   gen=True success_response=True boxed=False oob=False

tests/qapi-schema/indented-expr.out

+2 −2
Original line number Diff line number Diff line
@@ -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

   gen=True success_response=True boxed=False oob=False

command zwei None -> None

   gen=True success_response=True boxed=False
 
   gen=True success_response=True boxed=False oob=False

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

+9 −9
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ object Empty1 
object Empty2

    base Empty1

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']

    prefix QENUM_TWO

object UserDefOne
@@ -143,29 +143,29 @@ 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

   gen=True success_response=True boxed=False oob=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

   gen=True success_response=True boxed=False oob=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

   gen=True success_response=True boxed=False oob=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

   gen=True success_response=True boxed=False oob=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

   gen=True success_response=True boxed=False oob=False

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

   gen=True success_response=True boxed=True

   gen=True success_response=True boxed=True oob=False

object UserDefOptions

    member i64: intList 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 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
 
   gen=True success_response=True boxed=False oob=False

tests/qapi-schema/test-qapi.py

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor): 
                      gen, success_response, boxed, allow_oob):

        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' % \

              (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):

        print('event %s %s' % (name, arg_type and arg_type.name))