fix: success check does not consider pkg_dir #836

bioconda_utils/build.py

@@ -4,9 +4,10 @@
 
 import subprocess as sp
 from collections import defaultdict, namedtuple
-import os
-import logging
 import itertools
+import logging
+import os
+import sys
 
 from typing import List
 
@@ -116,6 +117,16 @@ def build(recipe: str, pkg_paths: List[str] = None,
                                         env=whitelisted_env,
                                         noarch=is_noarch)
             # Use presence of expected packages to check for success
+            if (docker_builder.pkg_dir is not None):
+                    platform = os.environ.get('OSTYPE', sys.platform)
+                    if platform.startswith("darwin"):
+                        platform = 'osx'
+                    elif platform == "linux-gnu":
+                        platform = "linux"
+
+                    config = utils.load_conda_build_config(platform=platform)
+                    pkg_paths = [p.replace(config.output_folder, docker_builder.pkg_dir) for p in pkg_paths]
+
             for pkg_path in pkg_paths:
                 if not os.path.exists(pkg_path):
                     logger.error(

test/test_utils.py

@@ -218,6 +218,30 @@ def test_single_build_only(single_build):
         assert os.path.exists(pkg)
 
 
+@pytest.mark.skipif(SKIP_DOCKER_TESTS, reason='skipping on osx')
+@pytest.mark.long_running_2
+def test_single_build_pkg_dir(recipes_fixture):
+    """
+    Builds the "one" recipe with pkg_dir.
+    """
+    logger.error("Making recipe builder")
+    docker_builder = docker_utils.RecipeBuilder(
+        use_host_conda_bld=True,
+        pkg_dir=os.getcwd() + "/output",
+        docker_base_image=DOCKER_BASE_IMAGE)
+    mulled_test = False
+    logger.error("DONE")
+    logger.error("Fixture: Building 'one' within docker with pkg_dir")
+    res = build.build(
+        recipe=recipes_fixture.recipe_dirs['one'],
+        pkg_paths=recipes_fixture.pkgs['one'],
+        docker_builder=docker_builder,
+        mulled_test=mulled_test,
+    )
+    logger.error("Fixture: Building 'one' within docker and pkg_dir -- DONE")
+    assert res.success
+
+
 @pytest.mark.skipif(SKIP_DOCKER_TESTS, reason='skipping on osx')
 def test_single_build_with_post_test(single_build):
     for pkg in single_build: