Add tests for merging ROOT and streamer files with different hardware resources

Author: makortel

IOPool/Input/test/BuildFile.xml

@@ -39,5 +39,6 @@
   </test>
   <test name="TestIOPoolInputRefProductIDMetadataConsistency" command="testRefProductIDMetadataConsistencyRoot.sh"/>
   <test name="TestIOPoolInputReducedProcessHistoryVersion" command="testReducedProcessHistoryVersion.sh"/>
+  <test name="TestIOPoolInputReducedProcessHistoryHardwareResources" command="testReducedProcessHistoryHardwareResources.sh"/>
 
 </environment>

IOPool/Input/test/testReducedProcessHistoryCreate_cfg.py

@@ -2,15 +2,30 @@
 import argparse
 
 parser = argparse.ArgumentParser(description='Create files for reduced ProcessHistory test')
-parser.add_argument("--version", type=str, help="CMSSW version to be used in the ProcessHistory")
+parser.add_argument("--version", type=str, help="CMSSW version to be used in the ProcessHistory (default is unset")
+parser.add_argument("--accelerators", type=str, nargs='+', help="Propagated to process.options.accelerators (default is unset)")
 parser.add_argument("--firstEvent", default=1, type=int, help="Number of first event")
 parser.add_argument("--lumi", default=1, type=int, help="LuminosityBlock number")
 parser.add_argument("--output", type=str, help="Output file name")
 
 args = parser.parse_args()
 
+class ProcessAcceleratorTest(cms.ProcessAccelerator):
+    def __init__(self):
+        super(ProcessAcceleratorTest,self).__init__()
+        self._labels = ["test-one", "test-two"]
+    def labels(self):
+        return self._labels
+    def enabledLabels(self):
+        return self._labels
+
+
 process = cms.Process("PROD")
-process._specialOverrideReleaseVersionOnlyForTesting(args.version)
+if args.version:
+    process._specialOverrideReleaseVersionOnlyForTesting(args.version)
+if args.accelerators:
+    process.add_(ProcessAcceleratorTest())
+    process.options.accelerators = args.accelerators
 
 process.maxEvents.input = 10
 

IOPool/Input/test/testReducedProcessHistoryHardwareResources.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+function die { echo $1: status $2 ;  exit $2; }
+function runSuccess {
+    echo "cmsRun $@"
+    cmsRun $@ || die "cmsRun $*" $?
+    echo
+}
+
+
+# Check that changing hardware resources does not lead to new lumi or run
+runSuccess ${SCRAM_TEST_PATH}/testReducedProcessHistoryCreate_cfg.py --accelerators test-one --firstEvent 1 --output test-one.root
+runSuccess ${SCRAM_TEST_PATH}/testReducedProcessHistoryCreate_cfg.py --accelerators test-two --firstEvent 101 --output test-two.root
+
+edmProvDump test-one.root | grep -q "PROD.*test-one" || die "Did not find test-one from test-one.root provenance" $?
+edmProvDump test-two.root | grep -q "PROD.*test-two" || die "Did not find test-two from test-two.root provenance" $?
+
+runSuccess ${SCRAM_TEST_PATH}/test_merge_two_files.py test-one.root test-two.root
+
+runSuccess ${SCRAM_TEST_PATH}/testReducedProcessHistory_cfg.py --input merged_files.root
+
+edmProvDump merged_files.root | grep -q "PROD.*test-one" || die "Did not find test-one from merged_files.root provenance" $?
+edmProvDump merged_files.root | grep -q "PROD.*test-two" || die "Did not find test-two from merged_files.root provenance" $?
+
+
+exit 0

IOPool/Streamer/test/BuildFile.xml

@@ -33,6 +33,7 @@
   <test name="TestIOPoolStreamerFailures" command="run_failures.sh"/>
 
   <test name="TestIOPoolStreamerReducedProcessHistoryVersion" command="run_TestReducedProcessHistoryVersion.sh"/>
+  <test name="TestIOPoolStreamerReducedProcessHistoryHardwareResources" command="run_TestReducedProcessHistoryHardwareResources.sh"/>
 
   <library file="StreamThingProducer.cc" name="StreamThingProducer">
     <flags EDM_PLUGIN="1"/>

IOPool/Streamer/test/run_TestReducedProcessHistoryHardwareResources.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+function die { echo Failure $1: status $2 ; exit $2 ; }
+function runSuccess {
+    echo "cmsRun $@"
+    cmsRun $@ || die "cmsRun $*" $?
+    echo
+}
+
+# Check that changing hardware resources does not lead to new lumi or run
+runSuccess ${SCRAM_TEST_PATH}/testReducedProcessHistoryCreate_cfg.py --accelerators test-one --firstEvent 1 --output test-one.dat
+runSuccess ${SCRAM_TEST_PATH}/testReducedProcessHistoryCreate_cfg.py --accelerators test-two --firstEvent 101 --output test-two.dat
+
+CatStreamerFiles merged.dat test-one.dat test-two.dat
+
+runSuccess ${SCRAM_TEST_PATH}/testReducedProcessHistory_cfg.py --input merged.dat --output merged.root
+
+edmProvDump merged.root | grep -q "PROD.*test-one" || die "Did not find test-one from merged.root provenance" $?
+edmProvDump merged.root | grep -q "PROD.*test-two" || die "Did not find test-two from merged.root provenance" $?
+
+exit 0

IOPool/Streamer/test/testReducedProcessHistoryCreate_cfg.py

@@ -2,15 +2,29 @@
 import argparse
 
 parser = argparse.ArgumentParser(description='Create files for reduced ProcessHistory test')
-parser.add_argument("--version", type=str, help="CMSSW version to be used in the ProcessHistory")
+parser.add_argument("--version", type=str, help="CMSSW version to be used in the ProcessHistory (default is unset")
+parser.add_argument("--accelerators", type=str, nargs='+', help="Propagated to process.options.accelerators (default is unset)")
 parser.add_argument("--firstEvent", default=1, type=int, help="Number of first event")
 parser.add_argument("--lumi", default=1, type=int, help="LuminosityBlock number")
 parser.add_argument("--output", type=str, help="Output file name")
 
 args = parser.parse_args()
 
+class ProcessAcceleratorTest(cms.ProcessAccelerator):
+    def __init__(self):
+        super(ProcessAcceleratorTest,self).__init__()
+        self._labels = ["test-one", "test-two"]
+    def labels(self):
+        return self._labels
+    def enabledLabels(self):
+        return self._labels
+
 process = cms.Process("PROD")
-process._specialOverrideReleaseVersionOnlyForTesting(args.version)
+if args.version:
+    process._specialOverrideReleaseVersionOnlyForTesting(args.version)
+if args.accelerators:
+    process.add_(ProcessAcceleratorTest())
+    process.options.accelerators = args.accelerators
 
 process.maxEvents.input = 10