Fixed replace with FinalPath

cms-sw · Feb 11, 2022 · b1f49c8 · b1f49c8
1 parent 18d26b4
commit b1f49c8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/FWCore/ParameterSet/python/Config.py b/FWCore/ParameterSet/python/Config.py
@@ -2719,17 +2719,22 @@ def testFinalPath(self):
             self.assertRaises(TypeError,FinalPath,p.es)
 
             t = FinalPath()
-            self.assertTrue(t.dumpPython(PrintOptions()) == 'cms.FinalPath()\n')
+            self.assertEqual(t.dumpPython(PrintOptions()), 'cms.FinalPath()\n')
 
             t = FinalPath(p.a)
-            self.assertTrue(t.dumpPython(PrintOptions()) == 'cms.FinalPath(process.a)\n')
+            self.assertEqual(t.dumpPython(PrintOptions()), 'cms.FinalPath(process.a)\n')
 
             self.assertRaises(TypeError, FinalPath, Task())
             self.assertRaises(TypeError, FinalPath, p.a, Task())
 
             p.prod = EDProducer("prodName")
             p.t1 = Task(p.prod)
             self.assertRaises(TypeError, FinalPath, p.a, p.t1, Task(), p.t1)
+
+            p.t = FinalPath(p.a)
+            p.a = OutputModule("ReplacedOutputModule")
+            self.assertEqual(p.t.dumpPython(PrintOptions()), 'cms.FinalPath(process.a)\n')
+
         def testCloneSequence(self):
             p = Process("test")
             a = EDAnalyzer("MyAnalyzer")

diff --git a/FWCore/ParameterSet/python/SequenceTypes.py b/FWCore/ParameterSet/python/SequenceTypes.py
@@ -450,8 +450,9 @@ def replace(self, original, replacement):
         self.visit(v)
         if v.didReplace():
             self._seq = v.result(self)[0]
-            self._tasks.clear()
-            self.associate(*v.result(self)[1])
+            if v.result(self)[1]:
+              self._tasks.clear()
+              self.associate(*v.result(self)[1])
         return v.didReplace()
     def _replaceIfHeldDirectly(self,original,replacement):
         """Only replaces an 'original' with 'replacement' if 'original' is directly held.
@@ -2103,6 +2104,13 @@ def testReplace(self):
             t3 = Task(m5)
             t2.replace(m2,t3)
             self.assertTrue(t2.dumpPython() == "cms.Task(process.m1, process.m3, process.m5)\n")
+
+            fp = FinalPath()
+            fp.replace(m1,m2)
+            self.assertEqual(fp.dumpPython(), "cms.FinalPath()\n")
+            fp = FinalPath(m1)
+            fp.replace(m1,m2)
+            self.assertEqual(fp.dumpPython(), "cms.FinalPath(process.m2)\n")
 
         def testReplaceIfHeldDirectly(self):
             m1 = DummyModule("m1")