yaml.py: Add loader for yaml test files cache option

* Fix to CWD issue provided by Jonathan Maw

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/yaml/yaml.py b/tests/yaml/yaml.py
index 781763717..70a8310c0 100644
--- a/tests/yaml/yaml.py
+++ b/tests/yaml/yaml.py
@@ -1,5 +1,6 @@
 import os
 import pytest
+import tempfile
 from collections import Mapping
 
 from buildstream import _yaml
@@ -150,6 +151,21 @@ def test_composite_preserve_originals(datafiles):
     assert(_yaml.node_get(orig_extra, str, 'old') == 'new')
 
 
+def load_yaml_file(filename, *, cache_path, shortname=None, from_cache='raw'):
+
+    _, temppath = tempfile.mkstemp(dir=os.path.join(cache_path.dirname, cache_path.basename), text=True)
+    context = Context()
+
+    with YamlCache.open(context, temppath) as yc:
+        if from_cache == 'raw':
+            return _yaml.load(filename, shortname)
+        elif from_cache == 'cached':
+            _yaml.load(filename, shortname, yaml_cache=yc)
+            return _yaml.load(filename, shortname, yaml_cache=yc)
+        else:
+            assert False
+
+
 # Tests for list composition
 #
 # Each test composits a filename on top of basics.yaml, and tests