diff options
| author | Jürg Billeter <j@bitron.ch> | 2020-01-16 12:14:49 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2020-02-03 18:44:30 +0000 |
| commit | dba3d8b0f7afe6ce7d43b6cbbb1477546a821c3f (patch) | |
| tree | 3a6c686b1a86898e8f24b7012ad4499cfd8193e3 | |
| parent | 4a3cba6efe8fa7b29ab6f2395c4683958f533490 (diff) | |
| download | buildstream-dba3d8b0f7afe6ce7d43b6cbbb1477546a821c3f.tar.gz | |
tests/integration/shell.py: xfail update
| -rw-r--r-- | tests/integration/shell.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/tests/integration/shell.py b/tests/integration/shell.py index 5e35d550c..c4725ec07 100644 --- a/tests/integration/shell.py +++ b/tests/integration/shell.py @@ -162,7 +162,10 @@ def test_no_shell(cli, datafiles): @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") -@pytest.mark.xfail(HAVE_SANDBOX == "buildbox-run", reason="Not working with BuildBox") +@pytest.mark.xfail( + HAVE_SANDBOX == "buildbox-run" and BUILDBOX_RUN != "buildbox-run-bubblewrap", + reason="Only available with bubblewrap", +) def test_host_files(cli, datafiles, path): project = str(datafiles) ponyfile = os.path.join(project, "files", "shell-mount", "pony.txt") @@ -177,7 +180,10 @@ def test_host_files(cli, datafiles, path): @pytest.mark.parametrize("path", [("/etc"), ("/usr/share/pony")]) @pytest.mark.datafiles(DATA_DIR) @pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox") -@pytest.mark.xfail(HAVE_SANDBOX == "buildbox-run", reason="Not working with BuildBox") +@pytest.mark.xfail( + HAVE_SANDBOX == "buildbox-run" and BUILDBOX_RUN != "buildbox-run-bubblewrap", + reason="Only available with bubblewrap", +) def test_host_files_expand_environ(cli, datafiles, path): project = str(datafiles) hostpath = os.path.join(project, "files", "shell-mount") @@ -250,7 +256,10 @@ def test_host_files_missing(cli, datafiles, optional): @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") -@pytest.mark.xfail(HAVE_SANDBOX == "buildbox-run", reason="Not working with BuildBox") +@pytest.mark.xfail( + HAVE_SANDBOX == "buildbox-run" and BUILDBOX_RUN != "buildbox-run-bubblewrap", + reason="Only available with bubblewrap", +) def test_cli_mount(cli, datafiles, path): project = str(datafiles) ponyfile = os.path.join(project, "files", "shell-mount", "pony.txt") |