Skip to content

Commit 325625d

Browse files
committed
argparse migration for SonicCore tests
1 parent d5118f1 commit 325625d

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

HeterogeneousCore/SonicCore/test/BuildFile.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<environment>
2-
<test name="TestHeterogeneousCoreSonicCoreProducer" command="cmsRun ${LOCALTOP}/src/HeterogeneousCore/SonicCore/test/sonicTest_cfg.py moduleType=Producer"/>
3-
<test name="TestHeterogeneousCoreSonicCoreFilter" command="cmsRun ${LOCALTOP}/src/HeterogeneousCore/SonicCore/test/sonicTest_cfg.py moduleType=Filter"/>
2+
<test name="TestHeterogeneousCoreSonicCoreProducer" command="cmsRun ${LOCALTOP}/src/HeterogeneousCore/SonicCore/test/sonicTest_cfg.py --moduleType Producer"/>
3+
<test name="TestHeterogeneousCoreSonicCoreFilter" command="cmsRun ${LOCALTOP}/src/HeterogeneousCore/SonicCore/test/sonicTest_cfg.py --moduleType Filter"/>
44
<test name="TestHeterogeneousCoreSonicCoreOneAnalyzer" command="cmsRun ${LOCALTOP}/src/HeterogeneousCore/SonicCore/test/sonicTestAna_cfg.py"/>
55
<library file="SonicDummyProducer.cc,SonicDummyFilter.cc,SonicDummyOneAnalyzer.cc" name="HeterogeneousCoreSonicCoreTest">
66
<flags EDM_PLUGIN="1"/>

HeterogeneousCore/SonicCore/test/sonicTestAna_cfg.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import FWCore.ParameterSet.Config as cms
2-
from FWCore.ParameterSet.VarParsing import VarParsing
32

43
process = cms.Process("Test")
54

HeterogeneousCore/SonicCore/test/sonicTest_cfg.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import FWCore.ParameterSet.Config as cms
2-
from FWCore.ParameterSet.VarParsing import VarParsing
3-
4-
options = VarParsing()
5-
options.register("moduleType","", VarParsing.multiplicity.singleton, VarParsing.varType.string)
6-
options.parseArguments()
2+
from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
73

84
_allowedModuleTypes = ["Producer","Filter"]
9-
if options.moduleType not in ["Producer","Filter"]:
10-
raise ValueError("Unknown module type: {} (allowed: {})".format(options.moduleType,_allowedModuleTypes))
5+
parser = ArgumentParser(formatter_class=ArgumentDefaultsHelpFormatter)
6+
parser.add_argument("--moduleType", type=str, required=True, choices=_allowedModuleTypes, help="Type of module to test")
7+
options = parser.parse_args()
8+
119
_moduleName = "SonicDummy"+options.moduleType
1210
_moduleClass = getattr(cms,"ED"+options.moduleType)
1311

0 commit comments

Comments
 (0)