Merge pull request #31865 from Dr15Jones/rmFwkJobReportsFWCore

Updated MessageLogger tests to remove obsolete usages
cms-sw · Oct 21, 2020 · bb15b10 · bb15b10
2 parents 6e2754b + 5e602a8
commit bb15b10
Show file tree

Hide file tree

Showing 62 changed files with 193 additions and 247 deletions.
diff --git a/FWCore/Integration/test/AssociationMapReadTest_cfg.py b/FWCore/Integration/test/AssociationMapReadTest_cfg.py
@@ -5,7 +5,7 @@
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 process.MessageLogger.destinations = ['cerr']
 process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
 
 process.load("FWCore.Framework.test.cmsExceptionsFatal_cff")
 

diff --git a/FWCore/Integration/test/AssociationMapTest_cfg.py b/FWCore/Integration/test/AssociationMapTest_cfg.py
@@ -5,7 +5,7 @@
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 process.MessageLogger.destinations = ['cerr']
 process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
 
 process.load("FWCore.Framework.test.cmsExceptionsFatal_cff")
 

diff --git a/FWCore/Integration/test/RefTest_cfg.py b/FWCore/Integration/test/RefTest_cfg.py
@@ -9,7 +9,7 @@
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 process.MessageLogger.destinations = ['cerr']
 process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
 
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(2)

diff --git a/FWCore/Integration/test/TransRefTest_cfg.py b/FWCore/Integration/test/TransRefTest_cfg.py
@@ -9,7 +9,7 @@
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 process.MessageLogger.destinations = ['cerr']
 process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
 
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(2)

diff --git a/FWCore/Integration/test/ViewTest_cfg.py b/FWCore/Integration/test/ViewTest_cfg.py
@@ -9,7 +9,7 @@
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 process.MessageLogger.destinations = ['cerr']
 process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
 
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(3)

diff --git a/FWCore/Integration/test/parentlessTest_cfg.py b/FWCore/Integration/test/parentlessTest_cfg.py
@@ -9,7 +9,7 @@
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 process.MessageLogger.destinations = ['cerr']
 process.MessageLogger.statistics = []
-process.MessageLogger.fwkJobReports = []
+
 
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(2)

diff --git a/FWCore/MessageService/bin/Standalone.cpp b/FWCore/MessageService/bin/Standalone.cpp
@@ -77,18 +77,12 @@ int main(int, char* argv[]) {
         "untracked PSet infos = {"
         "untracked string threshold = 'INFO'"
         "untracked PSet default = {untracked int32 limit = 1000000}"
-        "untracked PSet FwkJob = {untracked int32 limit = 0}"
         "}"
         "untracked PSet warnings = {"
         "untracked string threshold = 'WARNING'"
         "untracked PSet default = {untracked int32 limit = 1000000}"
         "}"
-        "untracked vstring fwkJobReports = {'FrameworkJobReport.xml'}"
-        "untracked vstring categories = {'FwkJob'}"
-        "untracked PSet FrameworkJobReport.xml = {"
-        "untracked PSet default = {untracked int32 limit = 0}"
-        "untracked PSet FwkJob = {untracked int32 limit = 10000000}"
-        "}"
+        "untracked vstring categories = {}"
         "}"
         "service = JobReportService{}"
         "service = SiteLocalConfigService{}"

diff --git a/FWCore/MessageService/test/AAA_AtlasOfTests b/FWCore/MessageService/test/AAA_AtlasOfTests
@@ -4,7 +4,7 @@ Tests marked $ are tested in both single thread and multithread running.
 Tests marked % are tested with both the default and EDM_ML_DEBUG defined.
 
 u1 $%	Gives different thresholds to multiple destinations, and assigns
-	limit=0 to annoying message categories preEventProcessing and FwkJob.
+	limit=0 to annoying message categories preEventProcessing and FwkTest.
 	Incidnetally tests noTimeStamps.  Also generates a job report file
 	(u1_job_report.mxml).   
 	---------- UnitTestClient_A
@@ -32,7 +32,7 @@ u5 $	Tests reset versus no reset behavior when multiple statistics
 u6 $	Tests hex and other manipulators
 	---------- UnitTestClient_C
 
-u7	Filtering all but one category (for example FwkJob).
+u7	Filtering all but one category (for example FwkTest).
 	Creates a fwkJobReports u7_job_report.mxml as well as logs. 
 	---------- UnitTestClient_C
 

diff --git a/FWCore/MessageService/test/MLexampleModule_1.cc b/FWCore/MessageService/test/MLexampleModule_1.cc
@@ -20,7 +20,7 @@ namespace edmtest {
     edm::LogWarning("cat_B") << "LogWarning was used to send this other message";
     edm::LogInfo("cat_A") << "LogInfo was used to send this message";
     edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
-    edm::LogInfo("FwkJob") << "<Message>LogInfo was used to send a job report</Message>";
+    edm::LogInfo("FwkTest") << "<Message>LogInfo was used to send a job report</Message>";
 
   }  // MessageLoggerClient::analyze()
 

diff --git a/FWCore/MessageService/test/PsetValidationSamples/cat_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/cat_cfg.py
@@ -15,8 +15,7 @@
     destinations = cms.untracked.vstring( 'u1_warnings',  'u1_errors',
                    'u1_infos',  'u1_debugs', 'u1_default', 'u1_x'), 
     statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y' ), 
-    fwkJobReports = cms.untracked.vstring( 'u1_f' ), 
-    categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+    categories = cms.untracked.vstring('preEventProcessing','FwkTest',
                                        'cat_A','cat_B', 'cat_J', 'cat_K'),
 
 # enabling any of these acter the first one should fail:
@@ -39,7 +38,7 @@
     u1_x = cms.untracked.PSet(
         threshold = cms.untracked.string('INFO'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -67,7 +66,7 @@
     u1_infos = cms.untracked.PSet(
         threshold = cms.untracked.string('INFO'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -81,7 +80,7 @@
     u1_debugs = cms.untracked.PSet(
         threshold = cms.untracked.string('DEBUG'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -90,7 +89,7 @@
     ),
     u1_default = cms.untracked.PSet(
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(

diff --git a/FWCore/MessageService/test/PsetValidationSamples/categories_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/categories_cfg.py
@@ -15,18 +15,17 @@
     destinations = cms.untracked.vstring( 'u1_warnings',  'u1_errors',
                    'u1_infos',  'u1_debugs', 'u1_default', 'u1_x'), 
     statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y'), 
-    fwkJobReports = cms.untracked.vstring( 'u1_f' ), 
 
 #enable one of the following -- the first should pass, the rest fail
-    categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+    categories = cms.untracked.vstring('preEventProcessing','FwkTest',
                                        'cat_A','cat_B'),
-#   categories = cms.vstring('preEventProcessing','FwkJob','u1_x'),
-#   categories = cms.vstring('preEventProcessing','FwkJob','u1_y'),
-#   categories = cms.vstring('preEventProcessing','FwkJob','u1_f'),
+#   categories = cms.vstring('preEventProcessing','FwkTest','u1_x'),
+#   categories = cms.vstring('preEventProcessing','FwkTest','u1_y'),
+#   categories = cms.vstring('preEventProcessing','FwkTest','u1_f'),
 #    categories = cms.untracked.int32(2),
-#    categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+#    categories = cms.untracked.vstring('preEventProcessing','FwkTest',
 #					'cat_A','cat_B','cat_A'),
-#    categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+#    categories = cms.untracked.vstring('preEventProcessing','FwkTest',
 #					'cat_A','cat_B','limit'),
 
 # If the passing one above enabled, enabling this should now fail:
@@ -35,7 +34,7 @@
     u1_infos = cms.untracked.PSet(
         threshold = cms.untracked.string('INFO'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -49,7 +48,7 @@
     u1_debugs = cms.untracked.PSet(
         threshold = cms.untracked.string('DEBUG'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -58,7 +57,7 @@
     ),
     u1_default = cms.untracked.PSet(
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(

diff --git a/FWCore/MessageService/test/PsetValidationSamples/debugModules_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/debugModules_cfg.py
@@ -15,8 +15,7 @@
     destinations = cms.untracked.vstring( 'u1_warnings',  'u1_errors',
                    'u1_infos',  'u1_debugs', 'u1_default', 'u1_x'), 
     statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y'), 
-    fwkJobReports = cms.untracked.vstring( 'u1_f' ), 
-    categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+    categories = cms.untracked.vstring('preEventProcessing','FwkTest',
                                        'cat_A','cat_B'),
 
 #enable one of the following -- the first THREE should pass, the rest fail
@@ -34,7 +33,7 @@
     u1_infos = cms.untracked.PSet(
         threshold = cms.untracked.string('INFO'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -48,7 +47,7 @@
     u1_debugs = cms.untracked.PSet(
         threshold = cms.untracked.string('DEBUG'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -57,7 +56,7 @@
     ),
     u1_default = cms.untracked.PSet(
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(

diff --git a/FWCore/MessageService/test/PsetValidationSamples/dest_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/dest_cfg.py
@@ -15,16 +15,15 @@
     destinations = cms.untracked.vstring( 'u1_warnings',  'u1_errors',
                    'u1_infos',  'u1_debugs', 'u1_default', 'u1_x'), 
     statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y' ), 
-    fwkJobReports = cms.untracked.vstring( 'u1_f' ), 
-    categories = cms.untracked.vstring('preEventProcessing','FwkJob',
+    categories = cms.untracked.vstring('preEventProcessing','FwkTest',
                                        'cat_A','cat_B'),
 
 # enabling any of these except the first 5 should fail:
 
     u1_x = cms.untracked.PSet(
         threshold = cms.untracked.string('INFO'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -53,7 +52,7 @@
     u1_infos = cms.untracked.PSet(
         threshold = cms.untracked.string('INFO'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -67,7 +66,7 @@
     u1_debugs = cms.untracked.PSet(
         threshold = cms.untracked.string('DEBUG'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -76,7 +75,7 @@
     ),
     u1_default = cms.untracked.PSet(
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(

diff --git a/FWCore/MessageService/test/PsetValidationSamples/destlist_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/destlist_cfg.py
@@ -37,7 +37,7 @@
     u1_infos = cms.untracked.PSet(
         threshold = cms.untracked.string('INFO'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -51,7 +51,7 @@
     u1_debugs = cms.untracked.PSet(
         threshold = cms.untracked.string('DEBUG'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -60,7 +60,7 @@
     ),
     u1_default = cms.untracked.PSet(
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -71,10 +71,9 @@
         threshold = cms.untracked.string('ERROR'),
         noTimeStamps = cms.untracked.bool(True)
     ),
-    fwkJobReports = cms.untracked.vstring('u1_job_report.mxml'),
     debugModules = cms.untracked.vstring('*'),
     categories = cms.untracked.vstring('preEventProcessing', 
-        'FwkJob')
+        'FwkTest')
 )
 
 process.maxEvents = cms.untracked.PSet(

diff --git a/FWCore/MessageService/test/PsetValidationSamples/fwkJRlist_cfg.py b/FWCore/MessageService/test/PsetValidationSamples/fwkJRlist_cfg.py
@@ -16,21 +16,11 @@
                    'u1_infos',  'u1_debugs', 'u1_default', 'u1_x'), 
     statistics = cms.untracked.vstring( 'u1_warnings', 'u1_default', 'u1_y'), 
 
-#enable one of the following -- the first should pass, the rest fail
-#     fwkJobReports = cms.untracked.vstring( 'u1_f' ), 
-#    fwkJobReports = cms.vstring('cout'),
-#    fwkJobReports = cms.untracked.int32(2),
-#    fwkJobReports = cms.untracked.vstring('u1_warnings', 'u1_errors', 'u1_warnings'),
-#    fwkJobReports = cms.untracked.vstring('cout','limit'),
-#    fwkJobReports = cms.untracked.vstring('u1_y'),
-#    fwkJobReports = cms.untracked.vstring('u1_x'),
-    fwkJobReports = cms.untracked.vstring('u1_y','u1_x'),
-
 
     u1_infos = cms.untracked.PSet(
         threshold = cms.untracked.string('INFO'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -44,7 +34,7 @@
     u1_debugs = cms.untracked.PSet(
         threshold = cms.untracked.string('DEBUG'),
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -53,7 +43,7 @@
     ),
     u1_default = cms.untracked.PSet(
         noTimeStamps = cms.untracked.bool(True),
-        FwkJob = cms.untracked.PSet(
+        FwkTest = cms.untracked.PSet(
             limit = cms.untracked.int32(0)
         ),
         preEventProcessing = cms.untracked.PSet(
@@ -66,7 +56,7 @@
     ),
     debugModules = cms.untracked.vstring('*'),
     categories = cms.untracked.vstring('preEventProcessing', 
-        'FwkJob')
+        'FwkTest')
 )
 
 process.maxEvents = cms.untracked.PSet(