[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 08/19] qapi: add tests for invalid 'data' field type
From: |
John Snow |
Subject: |
[PATCH v4 08/19] qapi: add tests for invalid 'data' field type |
Date: |
Thu, 25 Mar 2021 02:03:45 -0400 |
It needs to be an object (dict), not anything else.
Signed-off-by: John Snow <jsnow@redhat.com>
---
Note: this actually doesn't ... work, but on-list, we discussed wanting
tests first, then the fix. That can't happen here, because QAPI crashes
at runtime. So uh, just squash this into the following patch, I guess?
I tried.
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qapi-schema/alternate-invalid-data-type.err | 0
tests/qapi-schema/alternate-invalid-data-type.json | 4 ++++
tests/qapi-schema/alternate-invalid-data-type.out | 0
tests/qapi-schema/meson.build | 2 ++
tests/qapi-schema/union-invalid-data-type.err | 0
tests/qapi-schema/union-invalid-data-type.json | 13 +++++++++++++
tests/qapi-schema/union-invalid-data-type.out | 0
7 files changed, 19 insertions(+)
create mode 100644 tests/qapi-schema/alternate-invalid-data-type.err
create mode 100644 tests/qapi-schema/alternate-invalid-data-type.json
create mode 100644 tests/qapi-schema/alternate-invalid-data-type.out
create mode 100644 tests/qapi-schema/union-invalid-data-type.err
create mode 100644 tests/qapi-schema/union-invalid-data-type.json
create mode 100644 tests/qapi-schema/union-invalid-data-type.out
diff --git a/tests/qapi-schema/alternate-invalid-data-type.err
b/tests/qapi-schema/alternate-invalid-data-type.err
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qapi-schema/alternate-invalid-data-type.json
b/tests/qapi-schema/alternate-invalid-data-type.json
new file mode 100644
index 0000000000..7d5d905581
--- /dev/null
+++ b/tests/qapi-schema/alternate-invalid-data-type.json
@@ -0,0 +1,4 @@
+# Alternate type requires an object for 'data'
+{ 'alternate': 'Alt',
+ 'data': ['rubbish', 'nonsense']
+}
diff --git a/tests/qapi-schema/alternate-invalid-data-type.out
b/tests/qapi-schema/alternate-invalid-data-type.out
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index 8ba6917132..cc5b136cfb 100644
--- a/tests/qapi-schema/meson.build
+++ b/tests/qapi-schema/meson.build
@@ -15,6 +15,7 @@ schemas = [
'alternate-conflict-bool-string.json',
'alternate-conflict-num-string.json',
'alternate-empty.json',
+ 'alternate-invalid-data-type.json',
'alternate-invalid-dict.json',
'alternate-nested.json',
'alternate-unknown.json',
@@ -192,6 +193,7 @@ schemas = [
'union-clash-branches.json',
'union-empty.json',
'union-invalid-base.json',
+ 'union-invalid-data-type.json',
'union-optional-branch.json',
'union-unknown.json',
'unknown-escape.json',
diff --git a/tests/qapi-schema/union-invalid-data-type.err
b/tests/qapi-schema/union-invalid-data-type.err
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qapi-schema/union-invalid-data-type.json
b/tests/qapi-schema/union-invalid-data-type.json
new file mode 100644
index 0000000000..5a32d267bf
--- /dev/null
+++ b/tests/qapi-schema/union-invalid-data-type.json
@@ -0,0 +1,13 @@
+# the union data type must be an object.
+
+{ 'struct': 'TestTypeA',
+ 'data': { 'string': 'str' } }
+
+{ 'struct': 'TestTypeB',
+ 'data': { 'integer': 'int' } }
+
+{ 'union': 'TestUnion',
+ 'base': 'int',
+ 'discriminator': 'int',
+ 'data': ['TestTypeA', 'TestTypeB']
+}
diff --git a/tests/qapi-schema/union-invalid-data-type.out
b/tests/qapi-schema/union-invalid-data-type.out
new file mode 100644
index 0000000000..e69de29bb2
--
2.30.2
- [PATCH v4 02/19] flake8: Enforce shorter line length for comments and docstrings, (continued)
- [PATCH v4 02/19] flake8: Enforce shorter line length for comments and docstrings, John Snow, 2021/03/25
- [PATCH v4 03/19] qapi/expr.py: Remove 'info' argument from nested check_if_str, John Snow, 2021/03/25
- [PATCH v4 04/19] qapi/expr.py: Check for dict instead of OrderedDict, John Snow, 2021/03/25
- [PATCH v4 07/19] qapi/expr.py: move string check upwards in check_type, John Snow, 2021/03/25
- [PATCH v4 05/19] qapi/expr.py: constrain incoming expression types, John Snow, 2021/03/25
- [PATCH v4 06/19] qapi/expr.py: Add assertion for union type 'check_dict', John Snow, 2021/03/25
- [PATCH v4 08/19] qapi: add tests for invalid 'data' field type,
John Snow <=
- [PATCH v4 09/19] qapi/expr.py: Check type of 'data' member, John Snow, 2021/03/25
- [PATCH v4 10/19] qapi/expr.py: Add casts in a few select cases, John Snow, 2021/03/25
- [PATCH v4 12/19] qapi/expr.py: add type hint annotations, John Snow, 2021/03/25
- [PATCH v4 13/19] qapi/expr.py: Consolidate check_if_str calls in check_if, John Snow, 2021/03/25