[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 3/4] tests: qapi: Test 'features' of commands
From: |
Markus Armbruster |
Subject: |
Re: [PATCH v4 3/4] tests: qapi: Test 'features' of commands |
Date: |
Tue, 15 Oct 2019 08:51:56 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) |
Markus Armbruster <address@hidden> writes:
> From: Peter Krempa <address@hidden>
>
> Signed-off-by: Peter Krempa <address@hidden>
> Reviewed-by: Markus Armbruster <address@hidden>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> tests/test-qmp-cmds.c | 24 ++++++++++++++++++++++++
> tests/qapi-schema/qapi-schema-test.json | 22 ++++++++++++++++++++++
> tests/qapi-schema/qapi-schema-test.out | 23 +++++++++++++++++++++++
> tests/qapi-schema/test-qapi.py | 12 ++++++++----
> 4 files changed, 77 insertions(+), 4 deletions(-)
>
> diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c
> index 36fdf5b115..ba623fda29 100644
> --- a/tests/test-qmp-cmds.c
> +++ b/tests/test-qmp-cmds.c
> @@ -51,6 +51,30 @@ void qmp_test_features(FeatureStruct0 *fs0, FeatureStruct1
> *fs1,
> {
> }
>
> +void qmp_test_command_features1(Error **errp)
> +{
> +}
> +
> +void qmp_test_command_features2(Error **errp)
> +{
> +}
> +
> +void qmp_test_command_features3(Error **errp)
> +{
> +}
> +
> +void qmp_test_command_features4(Error **errp)
> +{
> +}
> +
> +void qmp_test_command_features5(Error **errp)
> +{
> +}
> +
> +void qmp_test_command_features6(Error **errp)
> +{
> +}
> +
> UserDefTwo *qmp_user_def_cmd2(UserDefOne *ud1a,
> bool has_udb1, UserDefOne *ud1b,
> Error **errp)
> diff --git a/tests/qapi-schema/qapi-schema-test.json
> b/tests/qapi-schema/qapi-schema-test.json
> index 75c42eb0e3..80811dc8f0 100644
> --- a/tests/qapi-schema/qapi-schema-test.json
> +++ b/tests/qapi-schema/qapi-schema-test.json
> @@ -290,3 +290,25 @@
> 'cfs1': 'CondFeatureStruct1',
> 'cfs2': 'CondFeatureStruct2',
> 'cfs3': 'CondFeatureStruct3' } }
> +
> +# test 'features' for command
> +
> +{ 'command': 'test-command-features1',
> + 'features': [] }
> +
> +{ 'command': 'test-command-features2',
> + 'features': [ 'feature1' ] }
> +
> +{ 'command': 'test-command-features3',
> + 'features': [ 'feature1', 'feature2' ] }
> +
> +{ 'command': 'test-command-features4',
> + 'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'} ] }
> +
> +{ 'command': 'test-command-features5',
> + 'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'},
> + { 'name': 'feature2', 'if': 'defined(TEST_IF_FEATURE_2)'} ] }
> +
> +{ 'command': 'test-command-features6',
> + 'features': [ { 'name': 'feature1', 'if': [ 'defined(TEST_IF_COND_1)',
> + 'defined(TEST_IF_COND_2)'] } ]
> }
> diff --git a/tests/qapi-schema/qapi-schema-test.out
> b/tests/qapi-schema/qapi-schema-test.out
> index aca43186a9..4061152cae 100644
> --- a/tests/qapi-schema/qapi-schema-test.out
> +++ b/tests/qapi-schema/qapi-schema-test.out
> @@ -412,3 +412,26 @@ object q_obj_test-features-arg
> member cfs3: CondFeatureStruct3 optional=False
> command test-features q_obj_test-features-arg -> None
> gen=True success_response=True boxed=False oob=False preconfig=False
> +command test-command-features1 None -> None
> + gen=True success_response=True boxed=False oob=False preconfig=False
> +command test-command-features2 None -> None
> + gen=True success_response=True boxed=False oob=False preconfig=False
> + feature feature1
> +command test-command-features3 None -> None
> + gen=True success_response=True boxed=False oob=False preconfig=False
> + feature feature1
> + feature feature2
> +command test-command-features4 None -> None
> + gen=True success_response=True boxed=False oob=False preconfig=False
> + feature feature1
> + if ['defined(TEST_IF_FEATURE_1)']
> +command test-command-features5 None -> None
> + gen=True success_response=True boxed=False oob=False preconfig=False
> + feature feature1
> + if ['defined(TEST_IF_FEATURE_1)']
> + feature feature2
> + if ['defined(TEST_IF_FEATURE_2)']
> +command test-command-features6 None -> None
> + gen=True success_response=True boxed=False oob=False preconfig=False
> + feature feature1
> + if ['defined(TEST_IF_COND_1)', 'defined(TEST_IF_COND_2)']
This might border on OCD... Your new tests for commands are patterned
after the existing tests for structs. You omit a few, and that's okay.
I'd like the names of corresponding tests to match; see appended
incremental patch.
[...]
diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c
index ba623fda29..27b0afe55a 100644
--- a/tests/test-qmp-cmds.c
+++ b/tests/test-qmp-cmds.c
@@ -51,27 +51,27 @@ void qmp_test_features(FeatureStruct0 *fs0, FeatureStruct1
*fs1,
{
}
+void qmp_test_command_features0(Error **errp)
+{
+}
+
void qmp_test_command_features1(Error **errp)
{
}
-void qmp_test_command_features2(Error **errp)
-{
-}
-
void qmp_test_command_features3(Error **errp)
{
}
-void qmp_test_command_features4(Error **errp)
+void qmp_test_command_cond_features1(Error **errp)
{
}
-void qmp_test_command_features5(Error **errp)
+void qmp_test_command_cond_features2(Error **errp)
{
}
-void qmp_test_command_features6(Error **errp)
+void qmp_test_command_cond_features3(Error **errp)
{
}
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index 80811dc8f0..9abf175fe0 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -293,22 +293,18 @@
# test 'features' for command
+{ 'command': 'test-command-features0',
+ 'features': [] }
{ 'command': 'test-command-features1',
- 'features': [] }
-
-{ 'command': 'test-command-features2',
'features': [ 'feature1' ] }
-
{ 'command': 'test-command-features3',
'features': [ 'feature1', 'feature2' ] }
-{ 'command': 'test-command-features4',
+{ 'command': 'test-command-cond-features1',
'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'} ] }
-
-{ 'command': 'test-command-features5',
+{ 'command': 'test-command-cond-features2',
'features': [ { 'name': 'feature1', 'if': 'defined(TEST_IF_FEATURE_1)'},
{ 'name': 'feature2', 'if': 'defined(TEST_IF_FEATURE_2)'} ] }
-
-{ 'command': 'test-command-features6',
+{ 'command': 'test-command-cond-features3',
'features': [ { 'name': 'feature1', 'if': [ 'defined(TEST_IF_COND_1)',
'defined(TEST_IF_COND_2)'] } ] }
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index 4061152cae..3660e75a48 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -412,26 +412,26 @@ object q_obj_test-features-arg
member cfs3: CondFeatureStruct3 optional=False
command test-features q_obj_test-features-arg -> None
gen=True success_response=True boxed=False oob=False preconfig=False
+command test-command-features0 None -> None
+ gen=True success_response=True boxed=False oob=False preconfig=False
command test-command-features1 None -> None
gen=True success_response=True boxed=False oob=False preconfig=False
-command test-command-features2 None -> None
- gen=True success_response=True boxed=False oob=False preconfig=False
feature feature1
command test-command-features3 None -> None
gen=True success_response=True boxed=False oob=False preconfig=False
feature feature1
feature feature2
-command test-command-features4 None -> None
+command test-command-cond-features1 None -> None
gen=True success_response=True boxed=False oob=False preconfig=False
feature feature1
if ['defined(TEST_IF_FEATURE_1)']
-command test-command-features5 None -> None
+command test-command-cond-features2 None -> None
gen=True success_response=True boxed=False oob=False preconfig=False
feature feature1
if ['defined(TEST_IF_FEATURE_1)']
feature feature2
if ['defined(TEST_IF_FEATURE_2)']
-command test-command-features6 None -> None
+command test-command-cond-features3 None -> None
gen=True success_response=True boxed=False oob=False preconfig=False
feature feature1
if ['defined(TEST_IF_COND_1)', 'defined(TEST_IF_COND_2)']
- [PATCH v4 0/4] qapi: Add detection for the 'savevm' fix for blockdev, Markus Armbruster, 2019/10/11
- [PATCH v4 2/4] qapi: Add feature flags to commands in qapi, Markus Armbruster, 2019/10/11
- [PATCH v4 4/4] qapi: Allow introspecting fix for savevm's cooperation with blockdev, Markus Armbruster, 2019/10/11
- [PATCH v4 3/4] tests: qapi: Test 'features' of commands, Markus Armbruster, 2019/10/11
- Re: [PATCH v4 3/4] tests: qapi: Test 'features' of commands,
Markus Armbruster <=
- [PATCH v4 1/4] tests/qapi-schema: Tidy up test output indentation, Markus Armbruster, 2019/10/11
- Re: [PATCH v4 0/4] qapi: Add detection for the 'savevm' fix for blockdev, Peter Krempa, 2019/10/11