Include duplicated task labels in exception message

lsst · Jun 8, 2021 · dd2b4cf · dd2b4cf
1 parent 94ff9f4
commit dd2b4cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/python/lsst/pipe/base/pipelineIR.py b/python/lsst/pipe/base/pipelineIR.py
@@ -623,7 +623,10 @@ def process_args(argument: Union[str, dict]) -> dict:
                        f"Top level pipeline defines {self.instrument} but {other_pipeline.location} "
                        f"defines {tmp_IR.instrument}.")
                 raise ValueError(msg)
-                                 "be unique")
+            if duplicate_labels := accumulate_tasks.keys() & tmp_IR.tasks.keys():
+                msg = ("Task labels in the imported pipelines must be unique. "
+                       f"These labels appear multiple times: {duplicate_labels}")
+                raise ValueError(msg)
             accumulate_tasks.update(tmp_IR.tasks)
             self.contracts.extend(tmp_IR.contracts)
             # verify that tmp_IR has unique labels for named subset among

diff --git a/tests/test_pipelineIR.py b/tests/test_pipelineIR.py
@@ -131,8 +131,8 @@ def testImportParsing(self):
             - $PIPE_BASE_DIR/tests/testPipeline1.yaml
             - $PIPE_BASE_DIR/tests/testPipeline2.yaml
         """)
-
-        with self.assertRaises(ValueError):
+        # "modA" is the duplicated label, and it should appear in the error.
+        with self.assertRaisesRegex(ValueError, "modA"):
             PipelineIR.from_string(pipeline_str)
 
         # This should pass, as the conflicting task is excluded