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>

diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index 664f9ee22dc7428e56704f82aa8e6afb89be2cd0..ffc276b765e7b440b979cacde34fa087c3defc27 100644 (file)
--- 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 (file)
index 717062c..0000000
--- 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-doc-required-crap.json b/tests/qapi-schema/pragma-doc-required-crap.json
deleted file mode 100644 (file)
index ed763c5..0000000
--- a/tests/qapi-schema/pragma-doc-required-crap.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# 'doc-required' must be bool
-
-{ 'pragma': { 'doc-required': {} } }

diff --git a/tests/qapi-schema/pragma-doc-required-crap.out b/tests/qapi-schema/pragma-doc-required-crap.out
deleted file mode 100644 (file)
index e69de29..0000000

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 (file)
index fbea90d..0000000
--- 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-name-case-whitelist-crap.json b/tests/qapi-schema/pragma-name-case-whitelist-crap.json
deleted file mode 100644 (file)
index 734e1c6..0000000
--- a/tests/qapi-schema/pragma-name-case-whitelist-crap.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# 'name-case-whitelist' must be list of strings
-
-{ 'pragma': { 'name-case-whitelist': false } }

diff --git a/tests/qapi-schema/pragma-name-case-whitelist-crap.out b/tests/qapi-schema/pragma-name-case-whitelist-crap.out
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/qapi-schema/pragma-returns-whitelist-crap.err b/tests/qapi-schema/pragma-returns-whitelist-crap.err
deleted file mode 100644 (file)
index 6978425..0000000
--- 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-returns-whitelist-crap.json b/tests/qapi-schema/pragma-returns-whitelist-crap.json
deleted file mode 100644 (file)
index f6b81b0..0000000
--- a/tests/qapi-schema/pragma-returns-whitelist-crap.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# 'returns-whitelist' must be list of strings
-
-{ 'pragma': { 'returns-whitelist': [ 'good', [ 'bad' ] ] } }

diff --git a/tests/qapi-schema/pragma-returns-whitelist-crap.out b/tests/qapi-schema/pragma-returns-whitelist-crap.out
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/tests/qapi-schema/pragma-value-not-bool.err b/tests/qapi-schema/pragma-value-not-bool.err
new file mode 100644 (file)
index 0000000..6247539
--- /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-value-not-bool.json b/tests/qapi-schema/pragma-value-not-bool.json
new file mode 100644 (file)
index 0000000..feb489f
--- /dev/null
+++ b/tests/qapi-schema/pragma-value-not-bool.json
@@ -0,0 +1,3 @@
+# pragma value must be bool
+
+{ 'pragma': { 'doc-required': {} } }

diff --git a/tests/qapi-schema/pragma-value-not-bool.out b/tests/qapi-schema/pragma-value-not-bool.out
new file mode 100644 (file)
index 0000000..e69de29

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 (file)
index 0000000..44870fe
--- /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-value-not-list-of-str.json b/tests/qapi-schema/pragma-value-not-list-of-str.json
new file mode 100644 (file)
index 0000000..12bbbed
--- /dev/null
+++ b/tests/qapi-schema/pragma-value-not-list-of-str.json
@@ -0,0 +1,3 @@
+# pragma value must be list of strings
+
+{ 'pragma': { 'returns-whitelist': [ 'good', [ 'bad' ] ] } }

diff --git a/tests/qapi-schema/pragma-value-not-list-of-str.out b/tests/qapi-schema/pragma-value-not-list-of-str.out
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/qapi-schema/pragma-value-not-list.err b/tests/qapi-schema/pragma-value-not-list.err
new file mode 100644 (file)
index 0000000..21736c5
--- /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-value-not-list.json b/tests/qapi-schema/pragma-value-not-list.json
new file mode 100644 (file)
index 0000000..2c61a97
--- /dev/null
+++ b/tests/qapi-schema/pragma-value-not-list.json
@@ -0,0 +1,3 @@
+# pragma value must be list
+
+{ 'pragma': { 'name-case-whitelist': false } }

diff --git a/tests/qapi-schema/pragma-value-not-list.out b/tests/qapi-schema/pragma-value-not-list.out
new file mode 100644 (file)
index 0000000..e69de29