Refactor of Platform and Sandbox

2 files changed, 14 insertions, 13 deletions

diff --git a/src/buildstream/testing/_utils/site.py b/src/buildstream/testing/_utils/site.py
index 64e0603ab..d51d37525 100644
--- a/src/buildstream/testing/_utils/site.py
+++ b/src/buildstream/testing/_utils/site.py
@@ -63,17 +63,21 @@ try:
 except ImportError:
     HAVE_ARPY = False
 
+try:
+    utils.get_host_tool('buildbox')
+    HAVE_BUILDBOX = True
+except ProgramNotFoundError:
+    HAVE_BUILDBOX = 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')
 
-if not IS_LINUX:
-    HAVE_SANDBOX = True   # fallback to a chroot sandbox on unix
-elif IS_WSL:
-    HAVE_SANDBOX = False  # Sandboxes are inoperable under WSL due to lack of FUSE
-elif IS_LINUX and HAVE_BWRAP:
-    HAVE_SANDBOX = True
-else:
-    HAVE_SANDBOX = False
-
 MACHINE_ARCH = Platform.get_host_arch()
+
+HAVE_SANDBOX = os.getenv('BST_FORCE_SANDBOX')
+
+if HAVE_SANDBOX is not None:
+    pass
+elif IS_LINUX and HAVE_BWRAP and (not IS_WSL):
+    HAVE_SANDBOX = 'bwrap'
diff --git a/src/buildstream/testing/runcli.py b/src/buildstream/testing/runcli.py
index 8e9065478..02334aa53 100644
--- a/src/buildstream/testing/runcli.py
+++ b/src/buildstream/testing/runcli.py
@@ -775,10 +775,7 @@ def cli_integration(tmpdir, integration_cache):
     directory = os.path.join(str(tmpdir), 'cache')
     os.makedirs(directory)
 
-    if os.environ.get('BST_FORCE_BACKEND') == 'unix':
-        fixture = CliIntegration(directory, default_options=[('linux', 'False')])
-    else:
-        fixture = CliIntegration(directory)
+    fixture = CliIntegration(directory)
 
     # We want to cache sources for integration tests more permanently,
     # to avoid downloading the huge base-sdk repeatedly