diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-07-02 16:06:45 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-15 14:14:03 +0000 |
| commit | 673f8f7fa761d61d7792d91fa2ef9d2595ad9f05 (patch) | |
| tree | 7379ded7500a8993c763e6b71d31681459db9d55 /tests | |
| parent | a2a2346ac1cb12ba76c894c46faf1468682b678f (diff) | |
| download | buildstream-673f8f7fa761d61d7792d91fa2ef9d2595ad9f05.tar.gz | |
_yaml: Move 'node_composite' to a method on 'MappingNode'
- Also take care of node_composite_move in the same way.
- Adapt all calling places
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/internals/yaml.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/internals/yaml.py b/tests/internals/yaml.py index 0432a0a84..9b3269d46 100644 --- a/tests/internals/yaml.py +++ b/tests/internals/yaml.py @@ -183,7 +183,7 @@ def test_composite_preserve_originals(datafiles): base = _yaml.load(filename) overlay = _yaml.load(overlayfile) base_copy = base.copy() - _yaml.composite(base_copy, overlay) + overlay.composite(base_copy) copy_extra = base_copy.get_mapping('extra') orig_extra = base.get_mapping('extra') @@ -249,7 +249,7 @@ def test_list_composition(datafiles, filename, tmpdir, base = _yaml.load(base_file, 'basics.yaml') overlay = _yaml.load(overlay_file, shortname=filename) - _yaml.composite(base, overlay) + overlay.composite(base) children = base.get_sequence('children') assert len(children) == length @@ -267,7 +267,7 @@ def test_list_deletion(datafiles): base = _yaml.load(base, shortname='basics.yaml') overlay = _yaml.load(overlay, shortname='listoverwriteempty.yaml') - _yaml.composite(base, overlay) + overlay.composite(base) children = base.get_sequence('children') assert not children @@ -384,8 +384,8 @@ def test_list_composition_twice(datafiles, tmpdir, filename1, filename2, overlay1 = _yaml.load(file1, shortname=filename1) overlay2 = _yaml.load(file2, shortname=filename2) - _yaml.composite(base, overlay1) - _yaml.composite(base, overlay2) + overlay1.composite(base) + overlay2.composite(base) children = base.get_sequence('children') assert len(children) == length @@ -401,8 +401,8 @@ def test_list_composition_twice(datafiles, tmpdir, filename1, filename2, overlay1 = _yaml.load(file1, shortname=filename1) overlay2 = _yaml.load(file2, shortname=filename2) - _yaml.composite(overlay1, overlay2) - _yaml.composite(base, overlay1) + overlay2.composite(overlay1) + overlay1.composite(base) children = base.get_sequence('children') assert len(children) == length |