[buildstream] 01/03: src/buildstream/testing/_utils/site.py: Disable bwrap when not using sanbox

[tv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tvb pushed a commit to branch valentindavid/chroot_fixes
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit c45375fcddbf48ce9487debe4afb8059b0134f3e
Author: Valentin David <va...@codethink.co.uk>
AuthorDate: Thu Jul 11 20:30:27 2019 +0200

    src/buildstream/testing/_utils/site.py: Disable bwrap when not using sanbox
    
    In order to test locally the code for chroot, one needs to define
    `BST_FORCE_BACKEND`. But many tests use HAVE_BWRAP only to test
    whether a test is made for bwrap, even if BuildStream will ignore
    bwrap. To simplify, we disable bwrap when not using Linux backend so
    one does not have to uninstall bwrap.
---
 src/buildstream/testing/_utils/site.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/buildstream/testing/_utils/site.py b/src/buildstream/testing/_utils/site.py
index 64e0603..f829151 100644
--- a/src/buildstream/testing/_utils/site.py
+++ b/src/buildstream/testing/_utils/site.py
@@ -69,6 +69,10 @@ IS_WINDOWS = (os.name == 'nt')
 
 if not IS_LINUX:
     HAVE_SANDBOX = True   # fallback to a chroot sandbox on unix
+    # Force disabling bwrap tests in case BST_FORCE_BACKEND was used
+    # but bwrap was available.
+    HAVE_BWRAP = False
+    HAVE_BWRAP_JSON_STATUS = False
 elif IS_WSL:
     HAVE_SANDBOX = False  # Sandboxes are inoperable under WSL due to lack of FUSE
 elif IS_LINUX and HAVE_BWRAP: