summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorjugglinmike <mike@mikepennisi.com>2016-05-31 18:04:31 -0400
committerLeo Balter <leonardo.balter@gmail.com>2016-05-31 18:04:31 -0400
commit330cea98f543e93441fad44c6d481920caaee68f (patch)
tree3619d15d9de4dd7164cf34fe30e2d4d33bbf9bdf /tools
parent1e75730d5f26b1c5dc63ecf85d610ed0c6297558 (diff)
downloadqtdeclarative-testsuites-330cea98f543e93441fad44c6d481920caaee68f.tar.gz
[runner] Add support for "folding" block delimiter (#654)
Diffstat (limited to 'tools')
-rw-r--r--tools/packaging/monkeyYaml.py2
-rw-r--r--tools/packaging/test/test_monkeyYaml.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/packaging/monkeyYaml.py b/tools/packaging/monkeyYaml.py
index 26ac194b4..b017e55b5 100644
--- a/tools/packaging/monkeyYaml.py
+++ b/tools/packaging/monkeyYaml.py
@@ -43,7 +43,7 @@ def load(str):
return dict
def myReadValue(lines, value):
- if value == ">":
+ if value == ">" or value == "|":
(lines, value) = myMultiline(lines, value)
value = value + "\n"
return (lines, value)
diff --git a/tools/packaging/test/test_monkeyYaml.py b/tools/packaging/test/test_monkeyYaml.py
index 64744f64e..df6667105 100644
--- a/tools/packaging/test/test_monkeyYaml.py
+++ b/tools/packaging/test/test_monkeyYaml.py
@@ -81,6 +81,11 @@ class TestMonkeyYAMLParsing(unittest.TestCase):
self.assertEqual(lines, [" other: 42"])
self.assertEqual(value, "foo bar")
+ def test_Multiline_5(self):
+ lines = ["info: |", " attr: this is a string (not nested yaml)", ""]
+ y = "\n".join(lines)
+ self.assertEqual(monkeyYaml.load(y), yaml.load(y))
+
def test_myLeading(self):
self.assertEqual(2, monkeyYaml.myLeadingSpaces(" foo"))
self.assertEqual(2, monkeyYaml.myLeadingSpaces(" "))