diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-05-31 14:55:54 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-06-06 14:33:59 +0000 |
| commit | 1730ba5a2dd3f325cbe8aed29a39ef6d0b8c14ab (patch) | |
| tree | a18664458b3d51d5a2b2314417dec775e82d933e /tests/integration | |
| parent | 09b0cf8a208c46440cdb4d59ef1388522f12857a (diff) | |
| download | buildstream-1730ba5a2dd3f325cbe8aed29a39ef6d0b8c14ab.tar.gz | |
test:utils/site: Consolidate Bwrap environment variables in a single place
We have two different 'site' files that are redundant and both define
some variables in BuildStream environment.
Moving all the bubblewrap related ones in a single place.
Diffstat (limited to 'tests/integration')
| -rw-r--r-- | tests/integration/build-uid.py | 4 | ||||
| -rw-r--r-- | tests/integration/cachedfail.py | 3 | ||||
| -rw-r--r-- | tests/integration/sandbox-bwrap.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tests/integration/build-uid.py b/tests/integration/build-uid.py index d11153d55..7d239ed99 100644 --- a/tests/integration/build-uid.py +++ b/tests/integration/build-uid.py @@ -5,7 +5,9 @@ import os import pytest from buildstream.testing import cli_integration as cli # pylint: disable=unused-import -from tests.testutils.site import HAVE_BWRAP, IS_LINUX, HAVE_SANDBOX +from buildstream.testing._utils.site import HAVE_BWRAP + +from tests.testutils.site import IS_LINUX, HAVE_SANDBOX pytestmark = pytest.mark.integration diff --git a/tests/integration/cachedfail.py b/tests/integration/cachedfail.py index 96cfdb723..5c29b338f 100644 --- a/tests/integration/cachedfail.py +++ b/tests/integration/cachedfail.py @@ -7,10 +7,11 @@ import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain from buildstream.testing import cli_integration as cli # pylint: disable=unused-import +from buildstream.testing._utils.site import HAVE_BWRAP from tests.conftest import clean_platform_cache from tests.testutils import create_artifact_share -from tests.testutils.site import HAVE_BWRAP, IS_LINUX, HAVE_SANDBOX +from tests.testutils.site import IS_LINUX, HAVE_SANDBOX pytestmark = pytest.mark.integration diff --git a/tests/integration/sandbox-bwrap.py b/tests/integration/sandbox-bwrap.py index e1c676ea5..d08076f5a 100644 --- a/tests/integration/sandbox-bwrap.py +++ b/tests/integration/sandbox-bwrap.py @@ -7,7 +7,7 @@ import pytest from buildstream._exceptions import ErrorDomain from buildstream.testing import cli_integration as cli # pylint: disable=unused-import -from tests.testutils.site import HAVE_BWRAP, HAVE_BWRAP_JSON_STATUS +from buildstream.testing._utils.site import HAVE_BWRAP, HAVE_BWRAP_JSON_STATUS pytestmark = pytest.mark.integration |