diff options
| author | Jürg Billeter <j@bitron.ch> | 2020-02-24 11:16:00 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2020-04-04 10:52:03 +0200 |
| commit | a002ce694160575fa3dea3e6bd477762b993c45c (patch) | |
| tree | fa81dab938462c6f605ff084f1044adaba0fe4cc | |
| parent | b11795a533238b0b6e113b9663e60a408e0a8011 (diff) | |
| download | buildstream-a002ce694160575fa3dea3e6bd477762b993c45c.tar.gz | |
tests/integration/build-uid.py: Don't skip tests with buildbox-run
buildbox-run-bubblewrap now supports custom uid/gid.
| -rw-r--r-- | tests/integration/build-uid.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/tests/integration/build-uid.py b/tests/integration/build-uid.py index 2fc78d263..a0cc20d3e 100644 --- a/tests/integration/build-uid.py +++ b/tests/integration/build-uid.py @@ -5,7 +5,7 @@ import os import pytest from buildstream.testing import cli_integration as cli # pylint: disable=unused-import -from buildstream.testing._utils.site import HAVE_SANDBOX, IS_LINUX +from buildstream.testing._utils.site import HAVE_SANDBOX, BUILDBOX_RUN pytestmark = pytest.mark.integration @@ -13,7 +13,11 @@ pytestmark = pytest.mark.integration DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "project") -@pytest.mark.skipif(not IS_LINUX or HAVE_SANDBOX != "bwrap", reason="Only available on linux with bubblewrap") +@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox") +@pytest.mark.xfail( + HAVE_SANDBOX == "buildbox-run" and BUILDBOX_RUN == "buildbox-run-userchroot", + reason="Custom UID/GID not supported by userchroot", +) @pytest.mark.datafiles(DATA_DIR) def test_build_uid_overridden(cli, datafiles): project = str(datafiles) @@ -25,7 +29,11 @@ def test_build_uid_overridden(cli, datafiles): assert result.exit_code == 0 -@pytest.mark.skipif(not IS_LINUX or HAVE_SANDBOX != "bwrap", reason="Only available on linux with bubbelwrap") +@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox") +@pytest.mark.xfail( + HAVE_SANDBOX == "buildbox-run" and BUILDBOX_RUN == "buildbox-run-userchroot", + reason="Custom UID/GID not supported by userchroot", +) @pytest.mark.datafiles(DATA_DIR) def test_build_uid_in_project(cli, datafiles): project = str(datafiles) @@ -37,8 +45,12 @@ def test_build_uid_in_project(cli, datafiles): assert result.exit_code == 0 +@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox") @pytest.mark.datafiles(DATA_DIR) -@pytest.mark.skipif(HAVE_SANDBOX != "bwrap", reason="Only available with a functioning sandbox") +@pytest.mark.xfail( + HAVE_SANDBOX == "buildbox-run" and BUILDBOX_RUN == "buildbox-run-userchroot", + reason="Custom UID/GID not supported by userchroot", +) def test_build_uid_default(cli, datafiles): project = str(datafiles) element_name = "build-uid/build-uid-default.bst" |