New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fixing removal of modules from FinalPath
#37022
Conversation
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37022/28449
|
A new Pull Request was created by @missirol (Marino Missiroli) for master. It involves the following packages:
@cmsbuild, @smuzaffar, @Dr15Jones, @makortel can you please review it and eventually sign? Thanks. cms-bot commands are listed here |
Thanks @missirol! @Dr15Jones, could you take a look? |
@cmsbuild, please test |
fp = FinalPath(m1) | ||
fp.remove(m1) | ||
self.assertEqual(fp.dumpPython(), "cms.FinalPath()\n") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you extend the test to also cover the case where there are multiple items in the FinalPath and only one is removed? I just want to test the if
branch
fp = FinalPath(m1) | |
fp.remove(m1) | |
self.assertEqual(fp.dumpPython(), "cms.FinalPath()\n") | |
fp = FinalPath(m1+m2) | |
fp.remove(m1) | |
self.assertEqual(fp.dumpPython(), "cms.FinalPath(process.m2)\n") | |
fp = FinalPath(m1) | |
fp.remove(m1) | |
self.assertEqual(fp.dumpPython(), "cms.FinalPath()\n") | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. Done by force-push to minimise commits.
a4585a6
to
43db69b
Compare
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37022/28458
|
Pull request #37022 was updated. @cmsbuild, @smuzaffar, @Dr15Jones, @makortel can you please check and sign again. |
@cmsbuild, please abort |
@cmsbuild, please test |
The bot reports 1 error, in the (HLT) |
-1 Failed Tests: AddOn AddOn Tests
Comparison SummarySummary:
|
MkFit has introduced some problems, as discussed in the ORP today. |
please test |
Regarding my previous comment, I should add that I was testing this PR on top of plain 12_3_0_pre5, not a recent IB. |
As long as it passes the FWCore/ParameterSet unit tests, I'm happy. |
+1 Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ce79da/22590/summary.html Comparison SummarySummary:
|
Backport to CMSSW_12_2_X of the following PRs: - cms-sw#36937 (b1f49c8) - cms-sw#37022 (43db69b)
type bugfix I took the liberty to open a backport of these FinalPath fixes to |
+1 |
This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @perrotta, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2) |
+1 |
PR description:
This PR follows #36932 and #36937, and concerns the removal of a module from a
FinalPath
.It looks like said removal does not work correctly in
12_3_0_pre5
, as [1] returns [2] (the issue was reported by @sanuvarghese from TSG).The implementation in this PR is basically a copy-paste of the solution provided by @Dr15Jones in #36937.
The PR is mainly a way to point out the issue. I'm happy to close it if it's incorrect/incomplete, of if experts prefer to take care of the implementation of this fix.
FYI: @Martin-Grunewald @Sam-Harper @silviodonato
[1] Example borrowed from #36932
[2]
PR validation:
The example in [1] works, and unit tests of
FWCore/ParameterSet
pass.If this PR is a backport, please specify the original PR and why you need to backport that PR:
N/A