diff options
| author | Benjamin Schubert <contact@benschubert.me> | 2019-06-10 07:51:57 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-15 14:14:02 +0000 |
| commit | 38671fb53f4522d046bed94699db8cc344ac2862 (patch) | |
| tree | dc75c432d897d393d3a568290d45d762c7bde093 /tests/elements | |
| parent | fcef3658433f74a2f396ed353bb3534f0001f3d8 (diff) | |
| download | buildstream-38671fb53f4522d046bed94699db8cc344ac2862.tar.gz | |
_yaml: Add 'as_str()' on ScalarNode and 'get_scalar()' on MappingNode
- 'get_scalar()' allows retrieving a scalar node from a mapping.
- 'as_str()' casts a ScalarNode into a string (thus removing the node
information).
Both together, those replace 'node_get(mapping, key, type=str)' but
also allow retrieving the 'Node' itself, which will allow in the future
lazier provenance computation.
Diffstat (limited to 'tests/elements')
| -rw-r--r-- | tests/elements/filter.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/elements/filter.py b/tests/elements/filter.py index d89c834e0..8292c09bb 100644 --- a/tests/elements/filter.py +++ b/tests/elements/filter.py @@ -240,7 +240,7 @@ def test_filter_track(datafiles, cli, tmpdir): # Now check that a ref field exists new_input = _yaml.load(input_file) source_node = _yaml.node_get(new_input, dict, 'sources', indices=[0]) - new_input_ref = _yaml.node_get(source_node, str, 'ref') + new_input_ref = source_node.get_str('ref') assert new_input_ref == ref @@ -349,7 +349,7 @@ def test_filter_track_multi_to_one(datafiles, cli, tmpdir): # Now check that a ref field exists new_input = _yaml.load(input_file) source_node = _yaml.node_get(new_input, dict, 'sources', indices=[0]) - new_ref = _yaml.node_get(source_node, str, 'ref') + new_ref = source_node.get_str('ref') assert new_ref == ref @@ -414,12 +414,12 @@ def test_filter_track_multi(datafiles, cli, tmpdir): # Now check that a ref field exists new_input = _yaml.load(input_file) source_node = _yaml.node_get(new_input, dict, 'sources', indices=[0]) - new_ref = _yaml.node_get(source_node, str, 'ref') + new_ref = source_node.get_str('ref') assert new_ref == ref new_input2 = _yaml.load(input2_file) source_node2 = _yaml.node_get(new_input2, dict, 'sources', indices=[0]) - new_ref2 = _yaml.node_get(source_node2, str, 'ref') + new_ref2 = source_node2.get_str('ref') assert new_ref2 == ref @@ -487,7 +487,7 @@ def test_filter_track_multi_exclude(datafiles, cli, tmpdir): new_input2 = _yaml.load(input2_file) source_node2 = _yaml.node_get(new_input2, dict, 'sources', indices=[0]) - new_ref2 = _yaml.node_get(source_node2, str, 'ref') + new_ref2 = source_node2.get_str('ref') assert new_ref2 == ref |