diff options
| author | Jürg Billeter <j@bitron.ch> | 2019-02-19 15:03:58 +0000 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2019-02-19 15:03:58 +0000 |
| commit | 99764715d68acdd95420eb1bbf16083b502ba668 (patch) | |
| tree | 679a072edeee6f57780c78c1b18dd9d5f183edfc | |
| parent | 4a002bee3bb267c5566a041a912bda424c47aa17 (diff) | |
| parent | 69675d225c41df2354c5ae700ddd300ea0ed5734 (diff) | |
| download | buildstream-99764715d68acdd95420eb1bbf16083b502ba668.tar.gz | |
Merge branch 'juerg/shell-test' into 'master'
tests/integration/shell.py: Improve test_isolated_no_mount
See merge request BuildStream/buildstream!1163
| -rw-r--r-- | tests/integration/shell.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/integration/shell.py b/tests/integration/shell.py index d1a551f53..97c4d0cad 100644 --- a/tests/integration/shell.py +++ b/tests/integration/shell.py @@ -212,6 +212,7 @@ def test_host_files_expand_environ(cli, tmpdir, datafiles, path): # Test that bind mounts defined in project.conf dont mount in isolation @pytest.mark.parametrize("path", [("/etc/pony.conf"), ("/usr/share/pony/pony.txt")]) @pytest.mark.datafiles(DATA_DIR) +@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox') def test_isolated_no_mount(cli, tmpdir, datafiles, path): project = os.path.join(datafiles.dirname, datafiles.basename) ponyfile = os.path.join(project, 'files', 'shell-mount', 'pony.txt') @@ -226,6 +227,8 @@ def test_isolated_no_mount(cli, tmpdir, datafiles, path): } }) assert result.exit_code != 0 + assert path in result.stderr + assert 'No such file or directory' in result.stderr # Test that we warn about non-existing files on the host if the mount is not |