diff options
| author | Jürg Billeter <j@bitron.ch> | 2019-12-05 06:40:00 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2019-12-10 15:31:37 +0100 |
| commit | ead0b11a205b475cf6b0a695d84b27ded1102894 (patch) | |
| tree | a7373916cb0349def0f92a570c785b5020bffd79 /tests/integration/shell.py | |
| parent | e223bcdaec8693814db0820e11643228bb3ac538 (diff) | |
| download | buildstream-ead0b11a205b475cf6b0a695d84b27ded1102894.tar.gz | |
tests: Drop buildbox xfails
Diffstat (limited to 'tests/integration/shell.py')
| -rw-r--r-- | tests/integration/shell.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/integration/shell.py b/tests/integration/shell.py index 394edeb1d..cea608016 100644 --- a/tests/integration/shell.py +++ b/tests/integration/shell.py @@ -158,7 +158,7 @@ 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 in ["buildbox", "buildbox-run"], reason="Not working with BuildBox") +@pytest.mark.xfail(HAVE_SANDBOX == "buildbox-run", reason="Not working with BuildBox") def test_host_files(cli, datafiles, path): project = str(datafiles) ponyfile = os.path.join(project, "files", "shell-mount", "pony.txt") @@ -173,7 +173,7 @@ 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 in ["buildbox", "buildbox-run"], reason="Not working with BuildBox") +@pytest.mark.xfail(HAVE_SANDBOX == "buildbox-run", reason="Not working with BuildBox") def test_host_files_expand_environ(cli, datafiles, path): project = str(datafiles) hostpath = os.path.join(project, "files", "shell-mount") @@ -246,7 +246,7 @@ 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 in ["buildbox", "buildbox-run"], reason="Not working with BuildBox") +@pytest.mark.xfail(HAVE_SANDBOX == "buildbox-run", reason="Not working with BuildBox") def test_cli_mount(cli, datafiles, path): project = str(datafiles) ponyfile = os.path.join(project, "files", "shell-mount", "pony.txt") @@ -294,7 +294,7 @@ def test_workspace_visible(cli, datafiles): # Test that '--sysroot' works @pytest.mark.datafiles(DATA_DIR) @pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox") -@pytest.mark.xfail(HAVE_SANDBOX in ["buildbox", "buildbox-run"], reason="Not working with BuildBox") +@pytest.mark.xfail(HAVE_SANDBOX == "buildbox-run", reason="Not working with BuildBox") def test_sysroot(cli, tmpdir, datafiles): project = str(datafiles) base_element = "base/base-alpine.bst" |