Merge pull request #23 from ktf/ktf/tagset-133153-bis

Unit tests related to bug fix in tagset 133141, forgot to include them.
cms-sw · Jul 2, 2013 · a50aaab · a50aaab
2 parents 1510e16 + 1fc3ee9
commit a50aaab
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 0 deletions.
diff --git a/FWCore/Integration/test/run_RunMerge.sh b/FWCore/Integration/test/run_RunMerge.sh
@@ -58,6 +58,9 @@ pushd ${LOCAL_TMP_DIR}
   echo ${test}MERGE4------------------------------------------------------------
   cmsRun -p ${LOCAL_TEST_DIR}/${test}MERGE4_cfg.py || die "cmsRun ${test}MERGE4_cfg.py" $?
 
+  echo ${test}MERGE5------------------------------------------------------------
+  cmsRun -p ${LOCAL_TEST_DIR}/${test}MERGE5_cfg.py || die "cmsRun ${test}MERGE5_cfg.py" $?
+
   echo ${test}TEST------------------------------------------------------------
   cmsRun -p ${LOCAL_TEST_DIR}/${test}TEST_cfg.py || die "cmsRun ${test}TEST_cfg.py" $?
 
@@ -76,6 +79,9 @@ pushd ${LOCAL_TMP_DIR}
   echo ${test}TEST4------------------------------------------------------------
   cmsRun -p ${LOCAL_TEST_DIR}/${test}TEST4_cfg.py || die "cmsRun ${test}TEST4_cfg.py" $?
 
+  echo ${test}TEST5------------------------------------------------------------
+  cmsRun -p ${LOCAL_TEST_DIR}/${test}TEST5_cfg.py || die "cmsRun ${test}TEST5_cfg.py" $?
+
   echo ${test}TEST11------------------------------------------------------------
   cmsRun -p ${LOCAL_TEST_DIR}/${test}TEST11_cfg.py || die "cmsRun ${test}TEST11_cfg.py" $?
 

diff --git a/FWCore/Integration/test/testRunMergeMERGE5_cfg.py b/FWCore/Integration/test/testRunMergeMERGE5_cfg.py
@@ -0,0 +1,23 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("MERGE5")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+
+process.source = cms.Source("PoolSource",
+    fileNames = cms.untracked.vstring(
+        'file:testRunMerge2extra.root'
+    )
+)
+
+process.out = cms.OutputModule("PoolOutputModule",
+    fileName = cms.untracked.string('testRunMergeMERGE5.root'),
+    outputCommands = cms.untracked.vstring(
+        'keep *', 
+        'drop *_aliasForThingToBeDropped2_*_*'
+    )
+)
+
+process.e = cms.EndPath(process.out)
diff --git a/FWCore/Integration/test/testRunMergeTEST5_cfg.py b/FWCore/Integration/test/testRunMergeTEST5_cfg.py
@@ -0,0 +1,24 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("TEST5")
+
+process.source = cms.Source("PoolSource",
+    fileNames = cms.untracked.vstring(
+        'file:testRunMergeMERGE5.root'
+    ),
+    secondaryFileNames = cms.untracked.vstring(
+        'file:testRunMerge2extra.root'
+    )
+)
+
+process.test = cms.EDAnalyzer("TestMergeResults",
+   testAlias = cms.untracked.bool(True)
+)
+
+process.path1 = cms.Path(process.test)
+
+process.out = cms.OutputModule("PoolOutputModule",
+    fileName = cms.untracked.string('testRunMergeTEST5.root')
+)
+
+process.e = cms.EndPath(process.out)