aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2021-03-23 10:40:14 +0100
committerMarkus Armbruster <armbru@redhat.com>2021-03-23 22:31:05 +0100
commite90a61e3cc1ab30a2069173aee8b592933d827a1 (patch)
tree66e8a7a3dded3e6e94fb33f318b22e6ec2d47940 /tests
parent4a67bd31a4a45773ed1e33ebd06ff949ff9525d7 (diff)
tests/qapi-schema: Rename pragma-*-crap to pragma-value-not-*
Rename pragma-doc-required-crap to pragma-not-bool, pragma-returns-whitelist-crap to pragma-value-not-list, and pragma-name-case-whitelist-crap to pragma-value-not-list-of-str. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20210323094025.3569441-18-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/qapi-schema/meson.build6
-rw-r--r--tests/qapi-schema/pragma-doc-required-crap.err1
-rw-r--r--tests/qapi-schema/pragma-name-case-whitelist-crap.err1
-rw-r--r--tests/qapi-schema/pragma-returns-whitelist-crap.err1
-rw-r--r--tests/qapi-schema/pragma-value-not-bool.err1
-rw-r--r--tests/qapi-schema/pragma-value-not-bool.json (renamed from tests/qapi-schema/pragma-doc-required-crap.json)2
-rw-r--r--tests/qapi-schema/pragma-value-not-bool.out (renamed from tests/qapi-schema/pragma-doc-required-crap.out)0
-rw-r--r--tests/qapi-schema/pragma-value-not-list-of-str.err1
-rw-r--r--tests/qapi-schema/pragma-value-not-list-of-str.json (renamed from tests/qapi-schema/pragma-returns-whitelist-crap.json)2
-rw-r--r--tests/qapi-schema/pragma-value-not-list-of-str.out (renamed from tests/qapi-schema/pragma-name-case-whitelist-crap.out)0
-rw-r--r--tests/qapi-schema/pragma-value-not-list.err1
-rw-r--r--tests/qapi-schema/pragma-value-not-list.json (renamed from tests/qapi-schema/pragma-name-case-whitelist-crap.json)2
-rw-r--r--tests/qapi-schema/pragma-value-not-list.out (renamed from tests/qapi-schema/pragma-returns-whitelist-crap.out)0
13 files changed, 9 insertions, 9 deletions
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index 664f9ee22d..ffc276b765 100644
--- a/tests/qapi-schema/meson.build
+++ b/tests/qapi-schema/meson.build
@@ -144,12 +144,12 @@ schemas = [
'oob-coroutine.json',
'oob-test.json',
'allow-preconfig-test.json',
- 'pragma-doc-required-crap.json',
'pragma-extra-junk.json',
- 'pragma-name-case-whitelist-crap.json',
'pragma-non-dict.json',
'pragma-unknown.json',
- 'pragma-returns-whitelist-crap.json',
+ 'pragma-value-not-bool.json',
+ 'pragma-value-not-list-of-str.json',
+ 'pragma-value-not-list.json',
'qapi-schema-test.json',
'quoted-structural-chars.json',
'redefined-command.json',
diff --git a/tests/qapi-schema/pragma-doc-required-crap.err b/tests/qapi-schema/pragma-doc-required-crap.err
deleted file mode 100644
index 717062cb14..0000000000
--- a/tests/qapi-schema/pragma-doc-required-crap.err
+++ /dev/null
@@ -1 +0,0 @@
-pragma-doc-required-crap.json:3: pragma 'doc-required' must be boolean
diff --git a/tests/qapi-schema/pragma-name-case-whitelist-crap.err b/tests/qapi-schema/pragma-name-case-whitelist-crap.err
deleted file mode 100644
index fbea90d6c5..0000000000
--- a/tests/qapi-schema/pragma-name-case-whitelist-crap.err
+++ /dev/null
@@ -1 +0,0 @@
-pragma-name-case-whitelist-crap.json:3: pragma name-case-whitelist must be a list of strings
diff --git a/tests/qapi-schema/pragma-returns-whitelist-crap.err b/tests/qapi-schema/pragma-returns-whitelist-crap.err
deleted file mode 100644
index 69784259df..0000000000
--- a/tests/qapi-schema/pragma-returns-whitelist-crap.err
+++ /dev/null
@@ -1 +0,0 @@
-pragma-returns-whitelist-crap.json:3: pragma returns-whitelist must be a list of strings
diff --git a/tests/qapi-schema/pragma-value-not-bool.err b/tests/qapi-schema/pragma-value-not-bool.err
new file mode 100644
index 0000000000..6247539616
--- /dev/null
+++ b/tests/qapi-schema/pragma-value-not-bool.err
@@ -0,0 +1 @@
+pragma-value-not-bool.json:3: pragma 'doc-required' must be boolean
diff --git a/tests/qapi-schema/pragma-doc-required-crap.json b/tests/qapi-schema/pragma-value-not-bool.json
index ed763c5ffc..feb489f15b 100644
--- a/tests/qapi-schema/pragma-doc-required-crap.json
+++ b/tests/qapi-schema/pragma-value-not-bool.json
@@ -1,3 +1,3 @@
-# 'doc-required' must be bool
+# pragma value must be bool
{ 'pragma': { 'doc-required': {} } }
diff --git a/tests/qapi-schema/pragma-doc-required-crap.out b/tests/qapi-schema/pragma-value-not-bool.out
index e69de29bb2..e69de29bb2 100644
--- a/tests/qapi-schema/pragma-doc-required-crap.out
+++ b/tests/qapi-schema/pragma-value-not-bool.out
diff --git a/tests/qapi-schema/pragma-value-not-list-of-str.err b/tests/qapi-schema/pragma-value-not-list-of-str.err
new file mode 100644
index 0000000000..44870fe5d9
--- /dev/null
+++ b/tests/qapi-schema/pragma-value-not-list-of-str.err
@@ -0,0 +1 @@
+pragma-value-not-list-of-str.json:3: pragma returns-whitelist must be a list of strings
diff --git a/tests/qapi-schema/pragma-returns-whitelist-crap.json b/tests/qapi-schema/pragma-value-not-list-of-str.json
index f6b81b093f..12bbbed2e8 100644
--- a/tests/qapi-schema/pragma-returns-whitelist-crap.json
+++ b/tests/qapi-schema/pragma-value-not-list-of-str.json
@@ -1,3 +1,3 @@
-# 'returns-whitelist' must be list of strings
+# pragma value must be list of strings
{ 'pragma': { 'returns-whitelist': [ 'good', [ 'bad' ] ] } }
diff --git a/tests/qapi-schema/pragma-name-case-whitelist-crap.out b/tests/qapi-schema/pragma-value-not-list-of-str.out
index e69de29bb2..e69de29bb2 100644
--- a/tests/qapi-schema/pragma-name-case-whitelist-crap.out
+++ b/tests/qapi-schema/pragma-value-not-list-of-str.out
diff --git a/tests/qapi-schema/pragma-value-not-list.err b/tests/qapi-schema/pragma-value-not-list.err
new file mode 100644
index 0000000000..21736c5723
--- /dev/null
+++ b/tests/qapi-schema/pragma-value-not-list.err
@@ -0,0 +1 @@
+pragma-value-not-list.json:3: pragma name-case-whitelist must be a list of strings
diff --git a/tests/qapi-schema/pragma-name-case-whitelist-crap.json b/tests/qapi-schema/pragma-value-not-list.json
index 734e1c617b..2c61a97dd3 100644
--- a/tests/qapi-schema/pragma-name-case-whitelist-crap.json
+++ b/tests/qapi-schema/pragma-value-not-list.json
@@ -1,3 +1,3 @@
-# 'name-case-whitelist' must be list of strings
+# pragma value must be list
{ 'pragma': { 'name-case-whitelist': false } }
diff --git a/tests/qapi-schema/pragma-returns-whitelist-crap.out b/tests/qapi-schema/pragma-value-not-list.out
index e69de29bb2..e69de29bb2 100644
--- a/tests/qapi-schema/pragma-returns-whitelist-crap.out
+++ b/tests/qapi-schema/pragma-value-not-list.out