diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2019-03-25 15:08:37 +0000 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2019-03-27 21:26:07 +0000 |
| commit | 3816dcf8901b06f2b9c0153e5b5fe394acf104a5 (patch) | |
| tree | e380f6c5386d97bc03707ccf8f20871b683e3b0b /tests/format/variables.py | |
| parent | 1e698622caee2da202a2511bbf41f476224d4cb8 (diff) | |
| download | buildstream-3816dcf8901b06f2b9c0153e5b5fe394acf104a5.tar.gz | |
The new YAML World Order
Replace YAML internals with a new Node type, and refactor everything
to use it cleanly.
This work was also by James Ennis <james.ennis@codethink.co.uk>
Signed-off-by: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Diffstat (limited to 'tests/format/variables.py')
| -rw-r--r-- | tests/format/variables.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/format/variables.py b/tests/format/variables.py index fe8d8ae8a..b62de7460 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -33,7 +33,7 @@ def print_warning(msg): ('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/buildstream-install\" install"), ('cmake.bst', 'cmake', "cmake -B_builddir -H\".\" -G\"Unix Makefiles\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + - "-DCMAKE_INSTALL_LIBDIR:PATH=\"lib\" "), + "-DCMAKE_INSTALL_LIBDIR:PATH=\"lib\""), ('distutils.bst', 'python-install', "python3 ./setup.py install --prefix \"/usr\" \\\n" + "--root \"/buildstream-install\""), @@ -49,7 +49,7 @@ def test_defaults(cli, datafiles, target, varname, expected): ]) result.assert_success() result_vars = _yaml.load_data(result.output) - assert result_vars[varname] == expected + assert _yaml.node_get(result_vars, str, varname) == expected ################################################################ @@ -59,7 +59,7 @@ def test_defaults(cli, datafiles, target, varname, expected): ('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/custom/install/root\" install"), ('cmake.bst', 'cmake', "cmake -B_builddir -H\".\" -G\"Ninja\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" + - "-DCMAKE_INSTALL_LIBDIR:PATH=\"lib\" "), + "-DCMAKE_INSTALL_LIBDIR:PATH=\"lib\""), ('distutils.bst', 'python-install', "python3 ./setup.py install --prefix \"/opt\" \\\n" + "--root \"/custom/install/root\""), @@ -75,7 +75,7 @@ def test_overrides(cli, datafiles, target, varname, expected): ]) result.assert_success() result_vars = _yaml.load_data(result.output) - assert result_vars[varname] == expected + assert _yaml.node_get(result_vars, str, varname) == expected @pytest.mark.datafiles(os.path.join(DATA_DIR, 'missing_variables')) |