diff options
| author | Benjamin Schubert <ben.c.schubert@gmail.com> | 2019-05-31 17:00:47 +0100 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-06-06 14:33:59 +0000 |
| commit | 3b56da44bdafeff1237391ad9edbb73010bcd5ee (patch) | |
| tree | 25834089a4e679cfbaa16e720889b1e80ed52840 | |
| parent | 75fb7e0bf5516ffcc812361410989b022921e520 (diff) | |
| download | buildstream-3b56da44bdafeff1237391ad9edbb73010bcd5ee.tar.gz | |
test:utils/site: Consolidate arpy 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 arpy related ones in a single place.
| -rw-r--r-- | src/buildstream/testing/_utils/site.py | 6 | ||||
| -rw-r--r-- | tests/sources/deb.py | 2 | ||||
| -rw-r--r-- | tests/testutils/site.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/buildstream/testing/_utils/site.py b/src/buildstream/testing/_utils/site.py index 306f41c9f..9d18d89bd 100644 --- a/src/buildstream/testing/_utils/site.py +++ b/src/buildstream/testing/_utils/site.py @@ -55,6 +55,12 @@ try: except ProgramNotFoundError: HAVE_LZIP = False +try: + import arpy # pylint: disable=unused-import + HAVE_ARPY = True +except ImportError: + HAVE_ARPY = False + IS_LINUX = os.getenv('BST_FORCE_BACKEND', sys.platform).startswith('linux') IS_WSL = (IS_LINUX and 'Microsoft' in platform.uname().release) IS_WINDOWS = (os.name == 'nt') diff --git a/tests/sources/deb.py b/tests/sources/deb.py index 69b7c78df..bdde20aaa 100644 --- a/tests/sources/deb.py +++ b/tests/sources/deb.py @@ -9,7 +9,7 @@ import pytest from buildstream._exceptions import ErrorDomain from buildstream import _yaml from buildstream.testing import cli # pylint: disable=unused-import -from tests.testutils.site import HAVE_ARPY +from buildstream.testing._utils.site import HAVE_ARPY from . import list_dir_contents DATA_DIR = os.path.join( diff --git a/tests/testutils/site.py b/tests/testutils/site.py index 3fcf7e150..b72be1e33 100644 --- a/tests/testutils/site.py +++ b/tests/testutils/site.py @@ -22,12 +22,6 @@ try: except (ImportError, ValueError): HAVE_OSTREE = False -try: - import arpy # pylint: disable=unused-import - HAVE_ARPY = True -except ImportError: - HAVE_ARPY = False - IS_LINUX = os.getenv('BST_FORCE_BACKEND', sys.platform).startswith('linux') IS_WSL = (IS_LINUX and 'Microsoft' in platform.uname().release) IS_WINDOWS = (os.name == 'nt') |