diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-07-09 17:31:43 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-15 14:14:03 +0000 |
| commit | 20335e6cd37cf40111042f324d2daec249628c64 (patch) | |
| tree | e44b9b7e835a502e153999836a722bb943458c9a /tests | |
| parent | 571550ad91f6ea73bc2ce5b0e433f8909aa3c0a0 (diff) | |
| download | buildstream-20335e6cd37cf40111042f324d2daec249628c64.tar.gz | |
_yaml: Set 'MappingNode' public-private API
- _composite -> __composite (internal)
- composite -> _composite (BuildStream private)
- composite_under -> _composite_under (BuildStream private)
- get -> _get (internal)
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 659b9a917..f2e1c70ef 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() - overlay.composite(base_copy) + 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) - overlay.composite(base) + 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') - overlay.composite(base) + overlay._composite(base) children = base.get_sequence('children') assert not children @@ -370,8 +370,8 @@ def test_list_composition_twice(datafiles, tmpdir, filename1, filename2, overlay1 = _yaml.load(file1, shortname=filename1) overlay2 = _yaml.load(file2, shortname=filename2) - overlay1.composite(base) - overlay2.composite(base) + overlay1._composite(base) + overlay2._composite(base) children = base.get_sequence('children') assert len(children) == length @@ -387,8 +387,8 @@ def test_list_composition_twice(datafiles, tmpdir, filename1, filename2, overlay1 = _yaml.load(file1, shortname=filename1) overlay2 = _yaml.load(file2, shortname=filename2) - overlay2.composite(overlay1) - overlay1.composite(base) + overlay2._composite(overlay1) + overlay1._composite(base) children = base.get_sequence('children') assert len(children) == length |