Permalink
Browse files

Add output module information to all steps. Fixes #3557.

From: Steve Foulkes <sfoulkes@fnal.gov>


git-svn-id: svn+ssh://svn.cern.ch/reps/CMSDMWM/WMCore/trunk@15617 4525493e-7705-40b1-a816-d608a930855b
  • Loading branch information...
1 parent 88862e9 commit 02ef2584d2e4fbd62fd01b06914134091f96e515 Steve Foulkes committed with sfoulkes Apr 6, 2012
@@ -124,6 +124,16 @@ def setupThreeStepChainedProcessing(self, stepOneTask):
stepThreeCmsswHelper.setConfigCache(self.couchURL, self.stepThreeConfigCacheID,
self.couchDBName)
+ configOutput = self.determineOutputModules(None, None, self.stepTwoConfigCacheID,
+ self.couchURL, self.couchDBName)
+ for outputModuleName in configOutput.keys():
+ outputModule = self.addOutputModule(stepOneTask,
+ outputModuleName,
+ self.inputPrimaryDataset,
+ configOutput[outputModuleName]["dataTier"],
+ configOutput[outputModuleName]["filterName"],
+ stepName = "cmsRun2")
+
configOutput = self.determineOutputModules(None, None, self.stepThreeConfigCacheID,
self.couchURL, self.couchDBName)
outputMods = {}
@@ -662,7 +662,15 @@ def testThreeStepChainedReDigi(self):
testWorkload = reDigiWorkload("TestWorkload", defaultArguments)
testWorkload.setSpecUrl("somespec")
testWorkload.setOwnerDetails("sfoulkes@fnal.gov", "DWMWM")
-
+
+ self.assertTrue(len(testWorkload.getTopLevelTask()) == 1,
+ "Error: Wrong number of top level tasks.")
+ topLevelTask = testWorkload.getTopLevelTask()[0]
+ topLevelStep = topLevelTask.steps()
+ cmsRun2Step = topLevelStep.getStep("cmsRun2").getTypeHelper()
+ self.assertTrue(len(cmsRun2Step.listOutputModules()) == 2,
+ "Error: Wrong number of output modules in cmsRun2.")
+
testWMBSHelper = WMBSHelper(testWorkload, "StepOneProc", "SomeBlock")
testWMBSHelper.createTopLevelFileset()
testWMBSHelper.createSubscription(testWMBSHelper.topLevelTask, testWMBSHelper.topLevelFileset)

0 comments on commit 02ef258

Please sign in to comment.