From 1730ba5a2dd3f325cbe8aed29a39ef6d0b8c14ab Mon Sep 17 00:00:00 2001 From: Benjamin Schubert Date: Fri, 31 May 2019 14:55:54 +0100 Subject: 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. --- tests/examples/autotools.py | 3 ++- tests/examples/developing.py | 3 ++- tests/examples/integration-commands.py | 3 ++- tests/examples/junctions.py | 3 ++- tests/examples/running-commands.py | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) (limited to 'tests/examples') diff --git a/tests/examples/autotools.py b/tests/examples/autotools.py index 03b98a5f4..6e300d888 100644 --- a/tests/examples/autotools.py +++ b/tests/examples/autotools.py @@ -6,7 +6,8 @@ import pytest from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from buildstream.testing.integration import assert_contains -from tests.testutils.site import HAVE_BWRAP, IS_LINUX, MACHINE_ARCH +from buildstream.testing._utils.site import HAVE_BWRAP +from tests.testutils.site import IS_LINUX, MACHINE_ARCH pytestmark = pytest.mark.integration diff --git a/tests/examples/developing.py b/tests/examples/developing.py index 6e17a7bc1..b635a6cd3 100644 --- a/tests/examples/developing.py +++ b/tests/examples/developing.py @@ -6,8 +6,9 @@ import pytest from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from buildstream.testing.integration import assert_contains +from buildstream.testing._utils.site import HAVE_BWRAP import tests.testutils.patch as patch -from tests.testutils.site import HAVE_BWRAP, IS_LINUX, MACHINE_ARCH +from tests.testutils.site import IS_LINUX, MACHINE_ARCH pytestmark = pytest.mark.integration diff --git a/tests/examples/integration-commands.py b/tests/examples/integration-commands.py index ad5119600..84ff5e172 100644 --- a/tests/examples/integration-commands.py +++ b/tests/examples/integration-commands.py @@ -5,7 +5,8 @@ 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, MACHINE_ARCH +from buildstream.testing._utils.site import HAVE_BWRAP +from tests.testutils.site import IS_LINUX, MACHINE_ARCH pytestmark = pytest.mark.integration diff --git a/tests/examples/junctions.py b/tests/examples/junctions.py index 695bfe8c8..97a12deee 100644 --- a/tests/examples/junctions.py +++ b/tests/examples/junctions.py @@ -5,7 +5,8 @@ import os import pytest from buildstream.testing import cli_integration as cli # pylint: disable=unused-import -from tests.testutils.site import IS_LINUX, HAVE_BWRAP, MACHINE_ARCH +from buildstream.testing._utils.site import HAVE_BWRAP +from tests.testutils.site import IS_LINUX, MACHINE_ARCH pytestmark = pytest.mark.integration diff --git a/tests/examples/running-commands.py b/tests/examples/running-commands.py index 7089f143e..1be1066d9 100644 --- a/tests/examples/running-commands.py +++ b/tests/examples/running-commands.py @@ -5,7 +5,8 @@ import os import pytest from buildstream.testing import cli_integration as cli # pylint: disable=unused-import -from tests.testutils.site import IS_LINUX, HAVE_BWRAP, MACHINE_ARCH +from buildstream.testing._utils.site import HAVE_BWRAP +from tests.testutils.site import IS_LINUX, MACHINE_ARCH pytestmark = pytest.mark.integration -- cgit v1.2.1