diff options
| author | Jürg Billeter <j@bitron.ch> | 2019-07-16 15:51:39 +0200 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-17 10:42:53 +0000 |
| commit | df92e8e08ea4ddfd58d6cfbf63d758cda5d3d44f (patch) | |
| tree | 18552a6b837d8df1a4ec01a2d043d0a64634890f /tests/sandboxes | |
| parent | 6160a64cfc4788d9c7e0519b77f55ed870b6a6a7 (diff) | |
| download | buildstream-df92e8e08ea4ddfd58d6cfbf63d758cda5d3d44f.tar.gz | |
Store Platform reference in Context instance variable
This allows us to remove the platform reset helpers in
tests/conftest.py.
Diffstat (limited to 'tests/sandboxes')
| -rw-r--r-- | tests/sandboxes/fallback.py | 4 | ||||
| -rw-r--r-- | tests/sandboxes/selection.py | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/tests/sandboxes/fallback.py b/tests/sandboxes/fallback.py index d8170c61d..f2f585e70 100644 --- a/tests/sandboxes/fallback.py +++ b/tests/sandboxes/fallback.py @@ -23,8 +23,6 @@ from buildstream import _yaml from buildstream._exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import -from tests.conftest import clean_platform_cache - pytestmark = pytest.mark.integration @@ -56,8 +54,6 @@ def test_fallback_platform_fails(cli, datafiles): } _yaml.roundtrip_dump(element, element_path) - clean_platform_cache() - result = cli.run(project=project, args=['build', 'element.bst'], env={'BST_FORCE_BACKEND': 'fallback', 'BST_FORCE_SANDBOX': None}) diff --git a/tests/sandboxes/selection.py b/tests/sandboxes/selection.py index 50406b4cb..eff247a95 100644 --- a/tests/sandboxes/selection.py +++ b/tests/sandboxes/selection.py @@ -23,8 +23,6 @@ from buildstream import _yaml from buildstream._exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import -from tests.conftest import clean_platform_cache - pytestmark = pytest.mark.integration @@ -56,8 +54,6 @@ def test_force_sandbox(cli, datafiles): } _yaml.roundtrip_dump(element, element_path) - clean_platform_cache() - # Build without access to host tools, this will fail result = cli.run(project=project, args=['build', 'element.bst'], env={'PATH': '', 'BST_FORCE_SANDBOX': 'bwrap'}) result.assert_main_error(ErrorDomain.PLATFORM, None) @@ -89,8 +85,6 @@ def test_dummy_sandbox_fallback(cli, datafiles): } _yaml.roundtrip_dump(element, element_path) - clean_platform_cache() - # Build without access to host tools, this will fail result = cli.run(project=project, args=['build', 'element.bst'], env={'PATH': '', 'BST_FORCE_SANDBOX': None}) # But if we dont spesify a sandbox then we fall back to dummy, we still |