diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-06-05 14:45:01 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-06-06 14:34:00 +0000 |
| commit | 556f71c9a3ccdc4c524f261926a364379506066d (patch) | |
| tree | 1eaa6f496116e0280c9b4dd7ab29ea0b11fe6f73 /tests/integration | |
| parent | 75433adb848cd92b1600391ff1553feaaf274608 (diff) | |
| download | buildstream-556f71c9a3ccdc4c524f261926a364379506066d.tar.gz | |
test:utils/site: Consolidate IS_LINUX/WSL/Windows in a single site
We currently have two sites file containing redundant information.
- tests/testutils/site.py: Remove IS_{LINUX,WSL,WINDOWS}
- rest: Change imports to import those from
buildstream/tests/_utils/site.py
Diffstat (limited to 'tests/integration')
| -rw-r--r-- | tests/integration/build-uid.py | 4 | ||||
| -rw-r--r-- | tests/integration/cachedfail.py | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/integration/build-uid.py b/tests/integration/build-uid.py index 851d83a3d..2ebf230a1 100644 --- a/tests/integration/build-uid.py +++ b/tests/integration/build-uid.py @@ -5,9 +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_BWRAP, HAVE_SANDBOX - -from tests.testutils.site import IS_LINUX +from buildstream.testing._utils.site import HAVE_BWRAP, HAVE_SANDBOX, IS_LINUX pytestmark = pytest.mark.integration diff --git a/tests/integration/cachedfail.py b/tests/integration/cachedfail.py index eb7723b64..a2273a06d 100644 --- a/tests/integration/cachedfail.py +++ b/tests/integration/cachedfail.py @@ -7,11 +7,10 @@ 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, HAVE_SANDBOX +from buildstream.testing._utils.site import HAVE_BWRAP, HAVE_SANDBOX, IS_LINUX from tests.conftest import clean_platform_cache from tests.testutils import create_artifact_share -from tests.testutils.site import IS_LINUX pytestmark = pytest.mark.integration |