Skip to content
Snippets Groups Projects
Commit f447816e authored by Sebastien Ponce's avatar Sebastien Ponce
Browse files

Merge branch 'gaudialg-tests-fixes-for-gaudi-39' into 'master' 

Fix GaudiAlg references and tests for Gaudi v39

See merge request !4668
parents e0dfb1f2 c1796923
No related branches found
No related tags found
1 merge request!4668Fix GaudiAlg references and tests for Gaudi v39
Pipeline #9255656 passed
Stage: test
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 12 additions and 8 deletions
    GaudiAlg/tests/qmtest/gaudialg.qms/auditors_user_timing.qmt
    + 1
    − 1
    View file @ f447816e
    ...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
    <argument name="options"><text> <argument name="options"><text>
    from Gaudi.Configuration import * from Gaudi.Configuration import *
    from Configurables import AuditorTestAlg, GaudiExamples__LoggingAuditor as LoggingAuditor from Configurables import AuditorTestAlg, GaudiExamples__LoggingAuditor as LoggingAuditor, TimingAuditor
    AuditorSvc().Auditors += [ TimingAuditor("TIMER"), AuditorSvc().Auditors += [ TimingAuditor("TIMER"),
    LoggingAuditor("LoggingAuditor") ] LoggingAuditor("LoggingAuditor") ]
    ......
    GaudiAlg/tests/qmtest/refs/Aida2Root.ref
    + 1
    − 0
    View file @ f447816e
    ...@@ -5,6 +5,7 @@ ApplicationMgr SUCCESS ...@@ -5,6 +5,7 @@ ApplicationMgr SUCCESS
    ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Application Manager Configured successfully
    SimpleHistos DEBUG Initialize base class GaudiCommon<Algorithm> SimpleHistos DEBUG Initialize base class GaudiCommon<Algorithm>
    SimpleHistos DEBUG could not locate CounterSummarySvc, no counter summary will be made SimpleHistos DEBUG could not locate CounterSummarySvc, no counter summary will be made
    SimpleHistos DEBUG Property ['Name': Value] = 'Asynchronous':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditExecute':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditExecute':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditFinalize':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditFinalize':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditInitialize':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditInitialize':False
    ......
    GaudiAlg/tests/qmtest/refs/EvtColsEx/Write.ref
    + 1
    − 1
    View file @ f447816e
    ...@@ -68,7 +68,7 @@ Fill SUCCESS Property ['Name': Value] = 'PropertiesPrint':True ...@@ -68,7 +68,7 @@ Fill SUCCESS Property ['Name': Value] = 'PropertiesPrint':True
    Fill SUCCESS Property ['Name': Value] = 'ErrorsPrint':True Fill SUCCESS Property ['Name': Value] = 'ErrorsPrint':True
    Fill SUCCESS Property ['Name': Value] = 'RootInTES':'' Fill SUCCESS Property ['Name': Value] = 'RootInTES':''
    Fill SUCCESS Property ['Name': Value] = 'FilterCircularDependencies':True Fill SUCCESS Property ['Name': Value] = 'FilterCircularDependencies':True
    Fill SUCCESS Property ['Name': Value] = 'Blocking':False Fill SUCCESS Property ['Name': Value] = 'Asynchronous':False
    Fill SUCCESS Property ['Name': Value] = 'NeededResources':[ ] Fill SUCCESS Property ['Name': Value] = 'NeededResources':[ ]
    Fill SUCCESS Property ['Name': Value] = 'Cardinality':1 Fill SUCCESS Property ['Name': Value] = 'Cardinality':1
    Fill SUCCESS Property ['Name': Value] = 'RegisterForContextService':True Fill SUCCESS Property ['Name': Value] = 'RegisterForContextService':True
    ......
    GaudiAlg/tests/qmtest/refs/GaudiCommonTests.ref
    + 4
    − 4
    View file @ f447816e
    ...@@ -40,7 +40,7 @@ Test1 DEBUG Property ['Name': Value] = 'PropertiesPrint':False ...@@ -40,7 +40,7 @@ Test1 DEBUG Property ['Name': Value] = 'PropertiesPrint':False
    Test1 DEBUG Property ['Name': Value] = 'ErrorsPrint':True Test1 DEBUG Property ['Name': Value] = 'ErrorsPrint':True
    Test1 DEBUG Property ['Name': Value] = 'RootInTES':'' Test1 DEBUG Property ['Name': Value] = 'RootInTES':''
    Test1 DEBUG Property ['Name': Value] = 'FilterCircularDependencies':True Test1 DEBUG Property ['Name': Value] = 'FilterCircularDependencies':True
    Test1 DEBUG Property ['Name': Value] = 'Blocking':False Test1 DEBUG Property ['Name': Value] = 'Asynchronous':False
    Test1 DEBUG Property ['Name': Value] = 'NeededResources':[ ] Test1 DEBUG Property ['Name': Value] = 'NeededResources':[ ]
    Test1 DEBUG Property ['Name': Value] = 'Cardinality':1 Test1 DEBUG Property ['Name': Value] = 'Cardinality':1
    Test1 DEBUG Property ['Name': Value] = 'RegisterForContextService':True Test1 DEBUG Property ['Name': Value] = 'RegisterForContextService':True
    ...@@ -73,7 +73,7 @@ Test2 DEBUG Property ['Name': Value] = 'PropertiesPrint':False ...@@ -73,7 +73,7 @@ Test2 DEBUG Property ['Name': Value] = 'PropertiesPrint':False
    Test2 DEBUG Property ['Name': Value] = 'ErrorsPrint':True Test2 DEBUG Property ['Name': Value] = 'ErrorsPrint':True
    Test2 DEBUG Property ['Name': Value] = 'RootInTES':'microDST/' Test2 DEBUG Property ['Name': Value] = 'RootInTES':'microDST/'
    Test2 DEBUG Property ['Name': Value] = 'FilterCircularDependencies':True Test2 DEBUG Property ['Name': Value] = 'FilterCircularDependencies':True
    Test2 DEBUG Property ['Name': Value] = 'Blocking':False Test2 DEBUG Property ['Name': Value] = 'Asynchronous':False
    Test2 DEBUG Property ['Name': Value] = 'NeededResources':[ ] Test2 DEBUG Property ['Name': Value] = 'NeededResources':[ ]
    Test2 DEBUG Property ['Name': Value] = 'Cardinality':1 Test2 DEBUG Property ['Name': Value] = 'Cardinality':1
    Test2 DEBUG Property ['Name': Value] = 'RegisterForContextService':True Test2 DEBUG Property ['Name': Value] = 'RegisterForContextService':True
    ...@@ -111,7 +111,7 @@ Test3 DEBUG Property ['Name': Value] = 'PropertiesPrint':False ...@@ -111,7 +111,7 @@ Test3 DEBUG Property ['Name': Value] = 'PropertiesPrint':False
    Test3 DEBUG Property ['Name': Value] = 'ErrorsPrint':True Test3 DEBUG Property ['Name': Value] = 'ErrorsPrint':True
    Test3 DEBUG Property ['Name': Value] = 'RootInTES':'' Test3 DEBUG Property ['Name': Value] = 'RootInTES':''
    Test3 DEBUG Property ['Name': Value] = 'FilterCircularDependencies':True Test3 DEBUG Property ['Name': Value] = 'FilterCircularDependencies':True
    Test3 DEBUG Property ['Name': Value] = 'Blocking':False Test3 DEBUG Property ['Name': Value] = 'Asynchronous':False
    Test3 DEBUG Property ['Name': Value] = 'NeededResources':[ ] Test3 DEBUG Property ['Name': Value] = 'NeededResources':[ ]
    Test3 DEBUG Property ['Name': Value] = 'Cardinality':1 Test3 DEBUG Property ['Name': Value] = 'Cardinality':1
    Test3 DEBUG Property ['Name': Value] = 'RegisterForContextService':True Test3 DEBUG Property ['Name': Value] = 'RegisterForContextService':True
    ...@@ -145,7 +145,7 @@ Test4 DEBUG Property ['Name': Value] = 'PropertiesPrint':False ...@@ -145,7 +145,7 @@ Test4 DEBUG Property ['Name': Value] = 'PropertiesPrint':False
    Test4 DEBUG Property ['Name': Value] = 'ErrorsPrint':True Test4 DEBUG Property ['Name': Value] = 'ErrorsPrint':True
    Test4 DEBUG Property ['Name': Value] = 'RootInTES':'microDST/' Test4 DEBUG Property ['Name': Value] = 'RootInTES':'microDST/'
    Test4 DEBUG Property ['Name': Value] = 'FilterCircularDependencies':True Test4 DEBUG Property ['Name': Value] = 'FilterCircularDependencies':True
    Test4 DEBUG Property ['Name': Value] = 'Blocking':False Test4 DEBUG Property ['Name': Value] = 'Asynchronous':False
    Test4 DEBUG Property ['Name': Value] = 'NeededResources':[ ] Test4 DEBUG Property ['Name': Value] = 'NeededResources':[ ]
    Test4 DEBUG Property ['Name': Value] = 'Cardinality':1 Test4 DEBUG Property ['Name': Value] = 'Cardinality':1
    Test4 DEBUG Property ['Name': Value] = 'RegisterForContextService':True Test4 DEBUG Property ['Name': Value] = 'RegisterForContextService':True
    ......
    GaudiAlg/tests/qmtest/refs/Histograms_opts.ref
    + 1
    − 0
    View file @ f447816e
    ...@@ -5,6 +5,7 @@ ApplicationMgr SUCCESS ...@@ -5,6 +5,7 @@ ApplicationMgr SUCCESS
    ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Application Manager Configured successfully
    SimpleHistos DEBUG Initialize base class GaudiCommon<Algorithm> SimpleHistos DEBUG Initialize base class GaudiCommon<Algorithm>
    SimpleHistos DEBUG could not locate CounterSummarySvc, no counter summary will be made SimpleHistos DEBUG could not locate CounterSummarySvc, no counter summary will be made
    SimpleHistos DEBUG Property ['Name': Value] = 'Asynchronous':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditExecute':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditExecute':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditFinalize':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditFinalize':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditInitialize':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditInitialize':False
    ......
    GaudiAlg/tests/qmtest/refs/Histograms_py.ref
    + 1
    − 0
    View file @ f447816e
    ...@@ -4,6 +4,7 @@ ApplicationMgr SUCCESS ...@@ -4,6 +4,7 @@ ApplicationMgr SUCCESS
    ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Application Manager Configured successfully
    SimpleHistos DEBUG Initialize base class GaudiCommon<Algorithm> SimpleHistos DEBUG Initialize base class GaudiCommon<Algorithm>
    SimpleHistos DEBUG could not locate CounterSummarySvc, no counter summary will be made SimpleHistos DEBUG could not locate CounterSummarySvc, no counter summary will be made
    SimpleHistos DEBUG Property ['Name': Value] = 'Asynchronous':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditExecute':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditExecute':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditFinalize':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditFinalize':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditInitialize':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditInitialize':False
    ......
    GaudiAlg/tests/qmtest/refs/gaudiconfig2/Histograms_wg.ref
    + 1
    − 0
    View file @ f447816e
    ...@@ -4,6 +4,7 @@ ApplicationMgr SUCCESS ...@@ -4,6 +4,7 @@ ApplicationMgr SUCCESS
    ApplicationMgr INFO Application Manager Configured successfully ApplicationMgr INFO Application Manager Configured successfully
    SimpleHistos DEBUG Initialize base class GaudiCommon<Algorithm> SimpleHistos DEBUG Initialize base class GaudiCommon<Algorithm>
    SimpleHistos DEBUG could not locate CounterSummarySvc, no counter summary will be made SimpleHistos DEBUG could not locate CounterSummarySvc, no counter summary will be made
    SimpleHistos DEBUG Property ['Name': Value] = 'Asynchronous':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditExecute':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditExecute':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditFinalize':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditFinalize':False
    SimpleHistos DEBUG Property ['Name': Value] = 'AuditInitialize':False SimpleHistos DEBUG Property ['Name': Value] = 'AuditInitialize':False
    ......
    GaudiAlg/tests/qmtest/scripts/HistoDumpEx.py
    + 1
    − 1
    View file @ f447816e
    ...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
    import random import random
    import ROOT import ROOT
    from GaudiPython.HistoUtils import histoDump from GaudiAlg.HistoUtils import histoDump
    r = random.Random() r = random.Random()
    ......
    GaudiAlg/tests/qmtest/scripts/HistoUtilsEx.py
    + 1
    − 1
    View file @ f447816e
    ...@@ -29,7 +29,7 @@ from math import cos, sin ...@@ -29,7 +29,7 @@ from math import cos, sin
    from GaudiPython.Bindings import AppMgr from GaudiPython.Bindings import AppMgr
    from GaudiPython.Bindings import gbl as cpp from GaudiPython.Bindings import gbl as cpp
    from GaudiPython.HistoUtils import aida2root, book, fill from GaudiAlg.HistoUtils import aida2root, book, fill
    print(__doc__) print(__doc__)
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment