diff options
Diffstat (limited to 'tests/integration/sandbox-bwrap.py')
| -rw-r--r-- | tests/integration/sandbox-bwrap.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/integration/sandbox-bwrap.py b/tests/integration/sandbox-bwrap.py index 2c939e9be..bc7c81164 100644 --- a/tests/integration/sandbox-bwrap.py +++ b/tests/integration/sandbox-bwrap.py @@ -5,7 +5,7 @@ from buildstream._exceptions import ErrorDomain from buildstream.plugintestutils import cli_integration as cli from buildstream.plugintestutils.integration import assert_contains -from tests.testutils.site import HAVE_BWRAP, HAVE_BWRAP_JSON_STATUS +from tests.testutils.site import BWRAP, HAVE_BWRAP_JSON_STATUS pytestmark = pytest.mark.integration @@ -21,7 +21,7 @@ DATA_DIR = os.path.join( # so BuildStream tries to remove them to do good. BuildStream should be extra # careful when those folders already exist and should not touch them, though. @pytest.mark.integration -@pytest.mark.skipif(not HAVE_BWRAP, reason='Only available with bubblewrap') +@pytest.mark.skipif(BWRAP is None, reason='Only available with bubblewrap') @pytest.mark.datafiles(DATA_DIR) def test_sandbox_bwrap_cleanup_build(cli, tmpdir, datafiles): project = os.path.join(datafiles.dirname, datafiles.basename) @@ -33,7 +33,7 @@ def test_sandbox_bwrap_cleanup_build(cli, tmpdir, datafiles): assert result.exit_code == 0 -@pytest.mark.skipif(not HAVE_BWRAP, reason='Only available with bubblewrap') +@pytest.mark.skipif(BWRAP is None, reason='Only available with bubblewrap') @pytest.mark.skipif(not HAVE_BWRAP_JSON_STATUS, reason='Only available with bubblewrap supporting --json-status-fd') @pytest.mark.datafiles(DATA_DIR) def test_sandbox_bwrap_distinguish_setup_error(cli, tmpdir, datafiles): @@ -45,7 +45,7 @@ def test_sandbox_bwrap_distinguish_setup_error(cli, tmpdir, datafiles): @pytest.mark.integration -@pytest.mark.skipif(not HAVE_BWRAP, reason='Only available with bubblewrap') +@pytest.mark.skipif(BWRAP is None, reason='Only available with bubblewrap') @pytest.mark.datafiles(DATA_DIR) def test_sandbox_bwrap_return_subprocess(cli, tmpdir, datafiles): project = os.path.join(datafiles.dirname, datafiles.basename) |