summaryrefslogtreecommitdiff
path: root/tests/format/include_composition.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/format/include_composition.py')
-rw-r--r--tests/format/include_composition.py87
1 files changed, 39 insertions, 48 deletions
diff --git a/tests/format/include_composition.py b/tests/format/include_composition.py
index b922c7a0e..f764b16a6 100644
--- a/tests/format/include_composition.py
+++ b/tests/format/include_composition.py
@@ -6,8 +6,7 @@ from buildstream import _yaml
def make_includes(basedir):
- _yaml.dump({'name': 'test'},
- os.path.join(basedir, 'project.conf'))
+ _yaml.roundtrip_dump({'name': 'test'}, os.path.join(basedir, 'project.conf'))
context = Context()
project = Project(basedir, context)
loader = project.loader
@@ -17,14 +16,12 @@ def make_includes(basedir):
def test_main_has_priority(tmpdir):
includes = make_includes(str(tmpdir))
- _yaml.dump({'(@)': ['a.yml'],
- 'test': ['main']},
- str(tmpdir.join('main.yml')))
+ _yaml.roundtrip_dump({'(@)': ['a.yml'], 'test': ['main']},
+ str(tmpdir.join('main.yml')))
main = _yaml.load(str(tmpdir.join('main.yml')))
- _yaml.dump({'test': ['a']},
- str(tmpdir.join('a.yml')))
+ _yaml.roundtrip_dump({'test': ['a']}, str(tmpdir.join('a.yml')))
includes.process(main)
@@ -34,13 +31,12 @@ def test_main_has_priority(tmpdir):
def test_include_cannot_append(tmpdir):
includes = make_includes(str(tmpdir))
- _yaml.dump({'(@)': ['a.yml'],
- 'test': ['main']},
- str(tmpdir.join('main.yml')))
+ _yaml.roundtrip_dump({'(@)': ['a.yml'], 'test': ['main']},
+ str(tmpdir.join('main.yml')))
main = _yaml.load(str(tmpdir.join('main.yml')))
- _yaml.dump({'test': {'(>)': ['a']}},
- str(tmpdir.join('a.yml')))
+ _yaml.roundtrip_dump({'test': {'(>)': ['a']}},
+ str(tmpdir.join('a.yml')))
includes.process(main)
@@ -50,13 +46,11 @@ def test_include_cannot_append(tmpdir):
def test_main_can_append(tmpdir):
includes = make_includes(str(tmpdir))
- _yaml.dump({'(@)': ['a.yml'],
- 'test': {'(>)': ['main']}},
- str(tmpdir.join('main.yml')))
+ _yaml.roundtrip_dump({'(@)': ['a.yml'], 'test': {'(>)': ['main']}},
+ str(tmpdir.join('main.yml')))
main = _yaml.load(str(tmpdir.join('main.yml')))
- _yaml.dump({'test': ['a']},
- str(tmpdir.join('a.yml')))
+ _yaml.roundtrip_dump({'test': ['a']}, str(tmpdir.join('a.yml')))
includes.process(main)
@@ -66,14 +60,14 @@ def test_main_can_append(tmpdir):
def test_sibling_cannot_append_backward(tmpdir):
includes = make_includes(str(tmpdir))
- _yaml.dump({'(@)': ['a.yml', 'b.yml']},
- str(tmpdir.join('main.yml')))
+ _yaml.roundtrip_dump({'(@)': ['a.yml', 'b.yml']},
+ str(tmpdir.join('main.yml')))
main = _yaml.load(str(tmpdir.join('main.yml')))
- _yaml.dump({'test': {'(>)': ['a']}},
- str(tmpdir.join('a.yml')))
- _yaml.dump({'test': ['b']},
- str(tmpdir.join('b.yml')))
+ _yaml.roundtrip_dump({'test': {'(>)': ['a']}},
+ str(tmpdir.join('a.yml')))
+ _yaml.roundtrip_dump({'test': ['b']},
+ str(tmpdir.join('b.yml')))
includes.process(main)
@@ -83,14 +77,14 @@ def test_sibling_cannot_append_backward(tmpdir):
def test_sibling_can_append_forward(tmpdir):
includes = make_includes(str(tmpdir))
- _yaml.dump({'(@)': ['a.yml', 'b.yml']},
- str(tmpdir.join('main.yml')))
+ _yaml.roundtrip_dump({'(@)': ['a.yml', 'b.yml']},
+ str(tmpdir.join('main.yml')))
main = _yaml.load(str(tmpdir.join('main.yml')))
- _yaml.dump({'test': ['a']},
- str(tmpdir.join('a.yml')))
- _yaml.dump({'test': {'(>)': ['b']}},
- str(tmpdir.join('b.yml')))
+ _yaml.roundtrip_dump({'test': ['a']},
+ str(tmpdir.join('a.yml')))
+ _yaml.roundtrip_dump({'test': {'(>)': ['b']}},
+ str(tmpdir.join('b.yml')))
includes.process(main)
@@ -100,14 +94,14 @@ def test_sibling_can_append_forward(tmpdir):
def test_lastest_sibling_has_priority(tmpdir):
includes = make_includes(str(tmpdir))
- _yaml.dump({'(@)': ['a.yml', 'b.yml']},
- str(tmpdir.join('main.yml')))
+ _yaml.roundtrip_dump({'(@)': ['a.yml', 'b.yml']},
+ str(tmpdir.join('main.yml')))
main = _yaml.load(str(tmpdir.join('main.yml')))
- _yaml.dump({'test': ['a']},
- str(tmpdir.join('a.yml')))
- _yaml.dump({'test': ['b']},
- str(tmpdir.join('b.yml')))
+ _yaml.roundtrip_dump({'test': ['a']},
+ str(tmpdir.join('a.yml')))
+ _yaml.roundtrip_dump({'test': ['b']},
+ str(tmpdir.join('b.yml')))
includes.process(main)
@@ -117,13 +111,11 @@ def test_lastest_sibling_has_priority(tmpdir):
def test_main_keeps_keys(tmpdir):
includes = make_includes(str(tmpdir))
- _yaml.dump({'(@)': ['a.yml'],
- 'something': 'else'},
- str(tmpdir.join('main.yml')))
+ _yaml.roundtrip_dump({'(@)': ['a.yml'], 'something': 'else'},
+ str(tmpdir.join('main.yml')))
main = _yaml.load(str(tmpdir.join('main.yml')))
- _yaml.dump({'test': ['a']},
- str(tmpdir.join('a.yml')))
+ _yaml.roundtrip_dump({'test': ['a']}, str(tmpdir.join('a.yml')))
includes.process(main)
@@ -134,20 +126,19 @@ def test_main_keeps_keys(tmpdir):
def test_overwrite_directive_on_later_composite(tmpdir):
includes = make_includes(str(tmpdir))
- _yaml.dump({'(@)': ['a.yml', 'b.yml'],
- 'test': {'(=)': ['Overwritten']}},
- str(tmpdir.join('main.yml')))
+ _yaml.roundtrip_dump({'(@)': ['a.yml', 'b.yml'], 'test': {'(=)': ['Overwritten']}},
+ str(tmpdir.join('main.yml')))
main = _yaml.load(str(tmpdir.join('main.yml')))
# a.yml
- _yaml.dump({'test': ['some useless', 'list', 'to be overwritten'],
- 'foo': 'should not be present'},
- str(tmpdir.join('a.yml')))
+ _yaml.roundtrip_dump({'test': ['some useless', 'list', 'to be overwritten'],
+ 'foo': 'should not be present'},
+ str(tmpdir.join('a.yml')))
# b.yaml isn't going to have a 'test' node to overwrite
- _yaml.dump({'foo': 'should be present'},
- str(tmpdir.join('b.yml')))
+ _yaml.roundtrip_dump({'foo': 'should be present'},
+ str(tmpdir.join('b.yml')))
includes.process(main)
View Lorry Controller Status