enable integration test

galaxyproject · Sep 24, 2024 · eacfbe7 · eacfbe7
1 parent 6a7e6b1
commit eacfbe7
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 0 deletions.
diff --git a/test/functional/tools/sample_tool_conf.xml b/test/functional/tools/sample_tool_conf.xml
@@ -278,6 +278,7 @@
   <!-- Tools for dependency and container testing. -->
   <tool file="legacy_r.xml" />
   <tool file="mulled_example_multi_1.xml" />
+  <tool file="mulled_example_multi_2.xml" />
   <tool file="mulled_example_multi_versionless.xml" />
   <tool file="mulled_example_multi_incomplete.xml" />
   <tool file="mulled_example_conflict.xml" />

diff --git a/test/integration/test_container_resolvers.py b/test/integration/test_container_resolvers.py
@@ -539,6 +539,58 @@ class TestDefaultContainerResolvers(DockerContainerResolverTestCase, ContainerRe
     }
 
 
+class TestDefaultContainerResolversWithBuildInfo(DockerContainerResolverTestCase, ContainerResolverTestCases, MulledTestCaseWithBuildInfo):
+    """
+    Same as TestDefaultContainerResolvers but with a tool using build info
+    serves to check if the mulled hashes are cumputed correctly
+    """
+
+    assumptions: Dict[str, Any] = {
+        "run": {
+            "output": [
+                "bedtools v2.26.0",
+                "samtools: error while loading shared libraries: libcrypto.so.1.0.0",
+            ],
+            "cached": True,
+            "resolver_type": "mulled",  # only used to check mulled / explicit
+            "cache_name": f"quay.io/biocontainers/{MulledTestCaseWithBuildInfo.mulled_hash}",
+            "cache_namespace": "biocontainers",
+        },
+        "list": [
+            {
+                "resolver_type": "mulled",
+                "identifier": f"quay.io/biocontainers/{MulledTestCaseWithBuildInfo.mulled_hash}",
+                "cached": False,
+                "cache_name": f"quay.io/biocontainers/{MulledTestCaseWithBuildInfo.mulled_hash}",
+                "cache_namespace": "biocontainers",
+            },
+            {
+                "resolver_type": "mulled",
+                "identifier": f"quay.io/biocontainers/{MulledTestCaseWithBuildInfo.mulled_hash}",
+                "cached": False,
+                "cache_name": f"quay.io/biocontainers/{MulledTestCaseWithBuildInfo.mulled_hash}",
+                "cache_namespace": "biocontainers",
+            },
+        ],
+        "build": [
+            {
+                "resolver_type": "mulled",
+                "identifier": f"quay.io/biocontainers/{MulledTestCaseWithBuildInfo.mulled_hash}",
+                "cached": True,
+                "cache_name": f"quay.io/biocontainers/{MulledTestCaseWithBuildInfo.mulled_hash}",
+                "cache_namespace": "biocontainers",
+            },
+            {
+                "resolver_type": "cached_mulled",
+                "identifier": f"quay.io/biocontainers/{MulledTestCaseWithBuildInfo.mulled_hash}",
+                "cached": True,
+                "cache_name": f"quay.io/biocontainers/{MulledTestCaseWithBuildInfo.mulled_hash}",
+                "cache_namespace": "biocontainers",
+            },
+        ],
+    }
+
+
 class TestDefaultSingularityContainerResolvers(
     SingularityContainerResolverTestCase, ContainerResolverTestCases, MulledTestCase
 ):