Skip to content

Commit b0141e3

Browse files
committed
Remove last use of Pool in FWCore tests
1 parent eef4621 commit b0141e3

File tree

3 files changed

+5
-91
lines changed

3 files changed

+5
-91
lines changed

FWCore/Modules/test/testBunchCrossingFilter.py

Lines changed: 0 additions & 80 deletions
This file was deleted.

FWCore/Modules/test/testEventAuxiliaryHistory_cfg.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,5 @@
1919
)
2020

2121

22-
process.out = cms.OutputModule("PoolOutputModule",
23-
fileName = cms.untracked.string('test.root')
24-
)
25-
2622

2723
process.p1 = cms.Path(process.aux)
28-
29-
process.e1 = cms.EndPath(process.out)

FWCore/PythonParameterSet/test/makepset_t.cppunit.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ void testmakepset::secsourceAux() {
7272
"process.maxEvents = cms.untracked.PSet(\n"
7373
" input = cms.untracked.int32(2)\n"
7474
")\n"
75-
"process.source = cms.Source('PoolSource',\n"
75+
"process.source = cms.Source('FileBasedSource',\n"
7676
" fileNames = cms.untracked.vstring('file:main.root')\n"
7777
")\n"
78-
"process.out = cms.OutputModule('PoolOutputModule',\n"
78+
"process.out = cms.OutputModule('FileBasedOutputModule',\n"
7979
" fileName = cms.string('file:CumHits.root')\n"
8080
")\n"
8181
"process.mix = cms.EDFilter('MixingModule',\n"
82-
" input = cms.SecSource('EmbeddedRootSource',\n"
82+
" input = cms.SecSource('EmbeddedFileBasedSource',\n"
8383
" fileNames = cms.untracked.vstring('file:pileup.root')\n"
8484
" ),\n"
8585
" max_bunch = cms.int32(3),\n"
@@ -101,7 +101,7 @@ void testmakepset::secsourceAux() {
101101
// Make sure this ParameterSet object has the right contents
102102
edm::ParameterSet const& mixingModuleParams = ps->getParameterSet("mix");
103103
edm::ParameterSet const& secondarySourceParams = mixingModuleParams.getParameterSet("input");
104-
CPPUNIT_ASSERT(secondarySourceParams.getParameter<std::string>("@module_type") == "EmbeddedRootSource");
104+
CPPUNIT_ASSERT(secondarySourceParams.getParameter<std::string>("@module_type") == "EmbeddedFileBasedSource");
105105
CPPUNIT_ASSERT(secondarySourceParams.getParameter<std::string>("@module_label") == "input");
106106
CPPUNIT_ASSERT(secondarySourceParams.getUntrackedParameter<std::vector<std::string> >("fileNames")[0] ==
107107
"file:pileup.root");
@@ -127,7 +127,7 @@ void testmakepset::usingBlockAux() {
127127
"process.maxEvents = cms.untracked.PSet(\n"
128128
" input = cms.untracked.int32(2)\n"
129129
")\n"
130-
"process.source = cms.Source('PoolSource',\n"
130+
"process.source = cms.Source('FileBasedSource',\n"
131131
" fileNames = cms.untracked.vstring('file:main.root')\n"
132132
")\n"
133133
"process.b = cms.PSet(\n"

0 commit comments

Comments
 (0)