[DRE-commits] [kwalify] 02/05: [patch] fixed missing quoting in test data, causing FTBFS
Marc Dequènes
duck at moszumanska.debian.org
Tue Aug 4 21:07:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
duck pushed a commit to branch master
in repository kwalify.
commit b552fa77514c96f22fb169b673abbfeff85a6ffc
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date: Tue Aug 4 22:22:26 2015 +0200
[patch] fixed missing quoting in test data, causing FTBFS
---
debian/changelog | 1 +
debian/patches/series | 1 +
debian/patches/yaml_tests_quoting_fix.patch | 299 ++++++++++++++++++++++++++++
3 files changed, 301 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 6004187..6049410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
kwalify (0.7.2-3) UNRELEASED; urgency=medium
* Added patch to fix using the deprecated YAML.load_documents method.
+ * Added patch to fix missing quoting in test data.
-- Marc Dequènes (Duck) <Duck at DuckCorp.org> Tue, 04 Aug 2015 21:33:19 +0200
diff --git a/debian/patches/series b/debian/patches/series
index e3fd2aa..72c20bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
yaml_deprecated.patch
+yaml_tests_quoting_fix.patch
diff --git a/debian/patches/yaml_tests_quoting_fix.patch b/debian/patches/yaml_tests_quoting_fix.patch
new file mode 100644
index 0000000..9e84cb6
--- /dev/null
+++ b/debian/patches/yaml_tests_quoting_fix.patch
@@ -0,0 +1,299 @@
+Index: kwalify/test/test-main.yaml
+===================================================================
+--- kwalify.orig/test/test-main.yaml
++++ kwalify/test/test-main.yaml
+@@ -375,7 +375,7 @@
+ schema: *preceding1_schema
+ document: *preceding1_document
+ exception*:
+- ruby: Kwalify::SyntaxError
++ ruby: "Kwalify::SyntaxError"
+ #java: kwalify.YamlSyntaxException
+ errormsg*:
+ ruby: "file: preceding2.schema, line 10: *USER: anchor not found."
+Index: kwalify/test/test-parser-yaml.yaml
+===================================================================
+--- kwalify.orig/test/test-parser-yaml.yaml
++++ kwalify/test/test-parser-yaml.yaml
+@@ -110,7 +110,7 @@ locations:
+ ---
+ name: sequence6
+ desc: syntax error - invalid indent of sequence.
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ - AAA
+@@ -124,7 +124,7 @@ locations:
+ ---
+ name: sequence7
+ desc: syntax error - sequence item is exepcted.
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ input: |
+ -
+ - a1
+@@ -224,7 +224,7 @@ locations:
+ ---
+ name: mapping5
+ desc: parse error - invalid indent of mapping.
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ input: |
+ A: 10
+ B: 20
+@@ -236,7 +236,7 @@ expected: |
+ ---
+ name: mapping6
+ desc: parse error - mapping item is expected.
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ input: |
+ A:
+ a1: 1
+@@ -564,7 +564,7 @@ locations:
+ name: flowseq4
+ desc: invalid flow style seq (sequence item required (or last comma is extra).)
+ mesg: sequence item required (or last comma is extra).
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ A: [ [10,20], ]
+@@ -576,7 +576,7 @@ locations:
+ name: flowseq5
+ desc: invalid flow style seq (flow style sequence requires ']').
+ mesg: flow style sequence requires ']'
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ A: [ [10,20]
+@@ -589,7 +589,7 @@ locations:
+ name: flowseq6
+ desc: invalid flow style seq (flow style sequence requires ']').
+ mesg: flow style sequence is closed but got ']'.
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ [ 10 ]]
+@@ -691,7 +691,7 @@ locations:
+ name: flowmap4
+ desc: invalid flow style map (mapping item required (or last comma is extra).)
+ mesg: mapping item required (or last comma is extra).
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ - {A: 10, B: 20, }
+@@ -703,7 +703,7 @@ locations:
+ name: flowmap5
+ desc: invalid flow style map (flow style mapping requires '}').
+ mesg: flow style mapping requires '}'
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ - {A: { x: 10, y: 20 }
+@@ -716,7 +716,7 @@ locations:
+ name: flowmap6
+ desc: invalid flow style map (flow style mapping requires ']').
+ mesg: flow style mapping is closed but got '}'.
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ { x: 10 }}
+@@ -933,7 +933,7 @@ locations:
+ ---
+ name: blocktext06
+ desc: invalid block text
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ - |
+@@ -1111,7 +1111,7 @@ locations:
+ ---
+ name: blocktext16
+ desc: invalid block text
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ - >
+@@ -1196,7 +1196,7 @@ input: |
+ - foo
+ - &a1 bar
+ #
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
+ errormsg: anchor 'a1' not found.
+ expected: |
+ ["bar", "bar", "foo", "bar"]
+@@ -1210,8 +1210,8 @@ locations:
+ ---
+ name: anchor5
+ desc: anchor not found
+-exception*: { ruby: Kwalify::SyntaxError, java: kwalify.SyntaxException }
+-mesg: anchor 'a2' not found (Kwalify::SyntaxError)
++exception*: { ruby: "Kwalify::SyntaxError", java: kwalify.SyntaxException }
++mesg: "anchor 'a2' not found (Kwalify::SyntaxError)"
+ #
+ input: |
+ - &a1 foo
+@@ -1386,7 +1386,7 @@ input: |
+ email: user1 at localhost
+ #
+ exception*:
+- ruby: Kwalify::SyntaxError
++ ruby: "Kwalify::SyntaxError"
+ #java: kwalify.SyntaxError
+ errormsg*:
+ ruby: "*USER1: anchor not found."
+Index: kwalify/test/test-yaml-parser.yaml
+===================================================================
+--- kwalify.orig/test/test-yaml-parser.yaml
++++ kwalify/test/test-yaml-parser.yaml
+@@ -77,7 +77,7 @@ expected: |
+ ---
+ name: sequence6
+ desc: syntax error - invalid indent of sequence.
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ - AAA
+@@ -90,7 +90,7 @@ expected: |
+ ---
+ name: sequence7
+ desc: syntax error - sequence item is exepcted.
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ input: |
+ -
+ - a1
+@@ -161,7 +161,7 @@ expected: |
+ ---
+ name: mapping5
+ desc: parse error - invalid indent of mapping.
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ input: |
+ A: 10
+ B: 20
+@@ -173,7 +173,7 @@ expected: |
+ ---
+ name: mapping6
+ desc: parse error - mapping item is expected.
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ input: |
+ A:
+ a1: 1
+@@ -376,7 +376,7 @@ expected: |
+ name: flowseq4
+ desc: invalid flow style seq (sequence item required (or last comma is extra).)
+ mesg: sequence item required (or last comma is extra).
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ A: [ [10,20], ]
+@@ -387,7 +387,7 @@ expected: |
+ name: flowseq5
+ desc: invalid flow style seq (flow style sequence requires ']').
+ mesg: flow style sequence requires ']'
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ A: [ [10,20]
+@@ -399,7 +399,7 @@ expected: |
+ name: flowseq6
+ desc: invalid flow style seq (flow style sequence requires ']').
+ mesg: flow style sequence is closed but got ']'.
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ [ 10 ]]
+@@ -463,7 +463,7 @@ expected: |
+ name: flowmap4
+ desc: invalid flow style map (mapping item required (or last comma is extra).)
+ mesg: mapping item required (or last comma is extra).
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ - {A: 10, B: 20, }
+@@ -474,7 +474,7 @@ expected: |
+ name: flowmap5
+ desc: invalid flow style map (flow style mapping requires '}').
+ mesg: flow style mapping requires '}'
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ - {A: { x: 10, y: 20 }
+@@ -486,7 +486,7 @@ expected: |
+ name: flowmap6
+ desc: invalid flow style map (flow style mapping requires ']').
+ mesg: flow style mapping is closed but got '}'.
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ #
+ input: |
+ { x: 10 }}
+@@ -656,7 +656,7 @@ expected: |
+ #---
+ #name: blocktext06
+ #desc: invalid block text
+-#exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++#exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ ##
+ #input: |
+ # - |
+@@ -804,7 +804,7 @@ expected: |
+ #---
+ #name: blocktext16
+ #desc: invalid block text
+-#exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
++#exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
+ ##
+ #input: |
+ # - >
+@@ -872,8 +872,8 @@ expected: |
+ ---
+ name: anchor5
+ desc: anchor not found
+-exception*: { ruby: Kwalify::YamlSyntaxError, java: kwalify.SyntaxException }
+-mesg: anchor 'a2' not found (Kwalify::YamlSyntaxError)
++exception*: { ruby: "Kwalify::YamlSyntaxError", java: kwalify.SyntaxException }
++mesg: "anchor 'a2' not found (Kwalify::YamlSyntaxError)"
+ #
+ input: |
+ - &a1 foo
+@@ -1011,7 +1011,7 @@ input: |
+ email: user1 at localhost
+ #
+ exception*:
+- ruby: Kwalify::YamlSyntaxError
++ ruby: "Kwalify::YamlSyntaxError"
+ #java: kwalify.SyntaxError
+ errormsg*:
+ ruby: "*USER1: anchor not found."
+Index: kwalify/test/test-action.yaml
+===================================================================
+--- kwalify.orig/test/test-action.yaml
++++ kwalify/test/test-action.yaml
+@@ -368,7 +368,7 @@
+ desc: action 'genclass-ruby'
+ action: genclass-ruby
+ method: action
+- args: [ -a, genclass-ruby, -tf, action_genclass_ruby2.schema, --module=My::DTO, --parent=BaseObject, "--include=Enumerable,Comparable", --hashlike ]
++ args: [ -a, genclass-ruby, -tf, action_genclass_ruby2.schema, "--module=My::DTO", --parent=BaseObject, "--include=Enumerable,Comparable", --hashlike ]
+ schema: &action_schema2 |
+ type: map
+ mapping:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/kwalify.git
More information about the Pkg-ruby-extras-commits
mailing list