[buildstream] 12/15: tests: include 'git' into isolated bin dirs

[tv...@apache.org]

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

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

commit b01efd5b1a3875237df243cb3ee75b3feba5cb80
Author: Angelos Evripiotis <je...@bloomberg.net>
AuthorDate: Tue Oct 29 17:17:50 2019 +0000

    tests: include 'git' into isolated bin dirs
    
    Symlink `git` into the separate tools bin directory, when trying to
    isolate tools. BuildStream needs `git` in order to be able to determine
    its version under certain conditions.
    
    This missing dependency is revealed when you run these tests in `spawn`
    mode, as it will re-run the base __init__.__version__ logic in a new
    process.
---
 tests/integration/cachedfail.py | 2 +-
 tests/sandboxes/selection.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/cachedfail.py b/tests/integration/cachedfail.py
index f624c48..f26100c 100644
--- a/tests/integration/cachedfail.py
+++ b/tests/integration/cachedfail.py
@@ -230,7 +230,7 @@ def test_push_failed_missing_shell(cli, tmpdir, datafiles, on_error):
 def test_host_tools_errors_are_not_cached(cli, datafiles, tmp_path):
     # Create symlink to buildbox-casd to work with custom PATH
     bin_dir = str(tmp_path / 'bin')
-    symlink_host_tools_to_dir(['buildbox-casd'], bin_dir)
+    symlink_host_tools_to_dir(['buildbox-casd', 'git'], bin_dir)
 
     project = str(datafiles)
     element_path = os.path.join(project, 'elements', 'element.bst')
diff --git a/tests/sandboxes/selection.py b/tests/sandboxes/selection.py
index db937d1..ca050b0 100644
--- a/tests/sandboxes/selection.py
+++ b/tests/sandboxes/selection.py
@@ -69,7 +69,7 @@ def test_force_sandbox(cli, datafiles):
 def test_dummy_sandbox_fallback(cli, datafiles, tmp_path):
     # Create symlink to buildbox-casd to work with custom PATH
     bin_dir = str(tmp_path / 'bin')
-    symlink_host_tools_to_dir(['buildbox-casd'], bin_dir)
+    symlink_host_tools_to_dir(['buildbox-casd', 'git'], bin_dir)
 
     project = str(datafiles)
     element_path = os.path.join(project, 'elements', 'element.bst')