Merge pull request #2786 from regro/pipes

BUG make sure to capture low-level stdout too

Author: beckermr

docker/run_bot_task.py

@@ -25,6 +25,7 @@
 from contextlib import contextmanager, redirect_stdout
 
 import click
+import wurlitzer
 
 existing_feedstock_node_attrs_option = click.option(
     "--existing-feedstock-node-attrs",
@@ -153,7 +154,7 @@ def _provide_source_code():
         output_source_code = "/cf_tick_dir/source_dir"
         os.makedirs(output_source_code, exist_ok=True)
 
-        with provide_source_code_local(recipe_dir) as cb_work_dir:
+        with wurlitzer.pipes(), provide_source_code_local(recipe_dir) as cb_work_dir:
             chmod_plus_rwX(cb_work_dir, recursive=True, skip_on_error=True)
             sync_dirs(
                 cb_work_dir, output_source_code, ignore_dot_git=True, update_git=False

tests/test_container_tasks.py

@@ -507,6 +507,37 @@ def test_container_tasks_provide_source_code_containerized(use_containers):
             assert "pyproject.toml" in os.listdir(source_dir)
 
 
+@pytest.mark.skipif(
+    not (HAVE_CONTAINERS and HAVE_TEST_IMAGE), reason="containers not available"
+)
+def test_container_tasks_provide_source_code_containerized_patches(use_containers):
+    with (
+        tempfile.TemporaryDirectory() as tmpdir,
+        pushd(tmpdir),
+    ):
+        subprocess.run(
+            [
+                "git",
+                "clone",
+                "https://github.com/conda-forge/tiledb-feedstock.git",
+            ]
+        )
+        with pushd("tiledb-feedstock"):
+            subprocess.run(
+                [
+                    "git",
+                    "checkout",
+                    "2.23.x",
+                ]
+            )
+
+        with provide_source_code_containerized("tiledb-feedstock/recipe") as source_dir:
+            assert os.path.exists(source_dir)
+            assert os.path.isdir(source_dir)
+            assert "tiledb" in os.listdir(source_dir)
+            assert "CMakeLists.txt" in os.listdir(source_dir)
+
+
 @pytest.mark.skipif(
     not (HAVE_CONTAINERS and HAVE_TEST_IMAGE), reason="containers not available"
 )