diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-02-28 18:47:20 +0000 |
|---|---|---|
| committer | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-02-28 18:47:20 +0000 |
| commit | 6d4a4e9928bb718d2da446a7d6a11708301625f2 (patch) | |
| tree | c4b25b736e26409a5d3eb3222d54fb1c7e445f0a /tests/examples/integration-commands.py | |
| parent | 348f04e7a80338de1b9cc911e48263d8cd31be65 (diff) | |
| download | buildstream-bschubert/fix-test-paths.tar.gz | |
store full host tools command in sites.py variables check.bschubert/fix-test-paths
This allows tests importing them to have access to the commands
directly and removes the need from calling this multiple times
This also fixes multiple bugs where the paths of the tests runners
might not be canonical and tools would not get found correctly
Diffstat (limited to 'tests/examples/integration-commands.py')
| -rw-r--r-- | tests/examples/integration-commands.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/examples/integration-commands.py b/tests/examples/integration-commands.py index abc64d951..f27e5e0c2 100644 --- a/tests/examples/integration-commands.py +++ b/tests/examples/integration-commands.py @@ -3,7 +3,7 @@ import pytest from buildstream.plugintestutils import cli_integration as cli from buildstream.plugintestutils.integration import assert_contains -from tests.testutils.site import HAVE_BWRAP, IS_LINUX, MACHINE_ARCH +from tests.testutils.site import BWRAP, IS_LINUX, MACHINE_ARCH pytestmark = pytest.mark.integration @@ -14,7 +14,7 @@ DATA_DIR = os.path.join( @pytest.mark.skipif(MACHINE_ARCH != 'x86-64', reason='Examples are writtent for x86-64') -@pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap') +@pytest.mark.skipif(not IS_LINUX or BWRAP is None, reason='Only available on linux with bubblewrap') @pytest.mark.datafiles(DATA_DIR) def test_integration_commands_build(cli, tmpdir, datafiles): project = os.path.join(datafiles.dirname, datafiles.basename) @@ -27,7 +27,7 @@ def test_integration_commands_build(cli, tmpdir, datafiles): # Test running the executable @pytest.mark.skipif(MACHINE_ARCH != 'x86-64', reason='Examples are writtent for x86-64') -@pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap') +@pytest.mark.skipif(not IS_LINUX or BWRAP is None, reason='Only available on linux with bubblewrap') @pytest.mark.datafiles(DATA_DIR) def test_integration_commands_run(cli, tmpdir, datafiles): project = os.path.join(datafiles.dirname, datafiles.basename) |