diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/integration/project/elements/sandbox/test-dev-shm.bst (renamed from tests/integration/project/elements/sandbox-bwrap/test-dev-shm.bst) | 0 | ||||
-rw-r--r-- | tests/integration/sandbox-bwrap.py | 10 | ||||
-rw-r--r-- | tests/integration/sandbox.py | 43 |
3 files changed, 43 insertions, 10 deletions
diff --git a/tests/integration/project/elements/sandbox-bwrap/test-dev-shm.bst b/tests/integration/project/elements/sandbox/test-dev-shm.bst index 03dc74a35..03dc74a35 100644 --- a/tests/integration/project/elements/sandbox-bwrap/test-dev-shm.bst +++ b/tests/integration/project/elements/sandbox/test-dev-shm.bst diff --git a/tests/integration/sandbox-bwrap.py b/tests/integration/sandbox-bwrap.py index 2908752de..a6312914b 100644 --- a/tests/integration/sandbox-bwrap.py +++ b/tests/integration/sandbox-bwrap.py @@ -55,13 +55,3 @@ def test_sandbox_bwrap_return_subprocess(cli, datafiles): result = cli.run(project=project, args=["build", element_name]) result.assert_task_error(error_domain=ErrorDomain.SANDBOX, error_reason="command-failed") assert "sandbox-bwrap/command-exit-42.bst|Command failed with exitcode 42" in result.stderr - - -@pytest.mark.skipif(HAVE_SANDBOX != "bwrap", reason="Only available with bubblewrap") -@pytest.mark.datafiles(DATA_DIR) -def test_sandbox_bwrap_dev_shm(cli, datafiles): - project = str(datafiles) - element_name = "sandbox-bwrap/test-dev-shm.bst" - - result = cli.run(project=project, args=["build", element_name]) - assert result.exit_code == 0 diff --git a/tests/integration/sandbox.py b/tests/integration/sandbox.py new file mode 100644 index 000000000..d772f5437 --- /dev/null +++ b/tests/integration/sandbox.py @@ -0,0 +1,43 @@ +# +# Copyright (C) 2019 Bloomberg Finance LP +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see <http://www.gnu.org/licenses/>. +# + +# Pylint doesn't play well with fixtures and dependency injection from pytest +# pylint: disable=redefined-outer-name + +import os +import pytest + +from buildstream.testing import cli_integration as cli # pylint: disable=unused-import +from buildstream.testing._utils.site import HAVE_SANDBOX + + +pytestmark = pytest.mark.integration + + +DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "project") + + +@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox") +@pytest.mark.xfail(HAVE_SANDBOX == "buildbox", reason="The buildbox sandbox doesn't support shm") +@pytest.mark.xfail(HAVE_SANDBOX == "chroot", reason="The chroot sandbox doesn't support shm") +@pytest.mark.datafiles(DATA_DIR) +def test_sandbox_shm(cli, datafiles): + project = str(datafiles) + element_name = "sandbox/test-dev-shm.bst" + + result = cli.run(project=project, args=["build", element_name]) + assert result.exit_code == 0 |