Skip to content
Snippets Groups Projects
Commit 04cd1713 authored by Rosen Matev's avatar Rosen Matev :sunny:
Browse files

Merge branch 'bcouturi_fix_dd4hep_tests' into 'master' 

Add global exclusion for the ROOT change of units warning printed on stderr and adapted tests

See merge request !3283
parents 45cdc958 6c495955
No related branches found
No related tags found
2 merge requests!3702merge counter decoder into Louis' original branch,!3283Add global exclusion for the ROOT change of units warning printed on stderr and adapted tests
Pipeline #3110474 passed
Stage: test
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 30 additions and 12 deletions
    Det/DetCond/tests/options/dd4hep_check_db_access.py
    + 3
    − 3
    View file @ 04cd1713
    ......@@ -24,9 +24,9 @@ LHCbApp().CondDBtag = "v1"
    # This variable should be set by the test environment to the location
    # of the test repository
    DDDBConf().ConditionsRepository = os.environ["GIT_TEST_REPOSITORY"]
    if UseDD4Hep:
    from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
    DD4hepSvc().DetectorList = ["/world"]
    from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
    DD4hepSvc().DetectorList = ["/world"]
    # Main application
    ##################
    ......
    Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_check_db_access.qmt
    + 1
    − 1
    View file @ 04cd1713
    ......@@ -18,6 +18,7 @@
    <text>../options/dd4hep_check_db_access.py</text>
    </set></argument>
    <argument name="reference"><text>../refs/dd4hep_check_db_access.ref</text></argument>
    <argument name="error_reference"><text>../refs/empty.ref</text></argument>
    <argument name="validator"><text>
    from GaudiConf.QMTest.LHCbExclusions import preprocessor as LHCbPreprocessor
    preprocessor = (LHCbPreprocessor +
    ......@@ -25,7 +26,6 @@ preprocessor = (LHCbPreprocessor +
    r'^(Compact|Conditions)Loader',
    r'^Statistics',
    r'^LHCb::Det::LbDD',
    'Changing system of units to ROOT units',
    ])
    )
    validateWithReference(preproc = preprocessor)
    ......
    Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_check_db_access_bare.qmt
    + 1
    − 1
    View file @ 04cd1713
    ......@@ -16,6 +16,7 @@
    <text>../options/new_cond_bare_repo.py</text>
    </set></argument>
    <argument name="reference"><text>../refs/dd4hep_check_db_access_bare.ref</text></argument>
    <argument name="error_reference"><text>../refs/empty.ref</text></argument>
    <argument name="validator"><text>
    from GaudiConf.QMTest.LHCbExclusions import preprocessor as LHCbPreprocessor
    preprocessor = (LHCbPreprocessor +
    ......@@ -23,7 +24,6 @@ preprocessor = (LHCbPreprocessor +
    r'^(Compact|Conditions)Loader',
    r'^Statistics',
    r'^LHCb::Det::LbDD',
    'Changing system of units to ROOT units',
    ])
    )
    validateWithReference(preproc = preprocessor)
    ......
    Det/DetCond/tests/qmtest/detcond.qms/condition_accessor.qms/dd4hep_conditions.qmt
    + 1
    − 1
    View file @ 04cd1713
    ......@@ -15,13 +15,13 @@
    <text>../options/dd4hep_cond.py</text>
    </set></argument>
    <argument name="reference"><text>../refs/dd4hep_conditions.ref</text></argument>
    <argument name="error_reference"><text>../refs/empty.ref</text></argument>
    <argument name="validator"><text>
    from GaudiConf.QMTest.LHCbExclusions import preprocessor as LHCbPreprocessor
    preprocessor = (LHCbPreprocessor +
    LineSkipper(regexps=[
    r'^(Compact|Conditions)Loader',
    r'^Statistics',
    'Changing system of units to ROOT units',
    ])
    )
    validateWithReference(preproc = preprocessor
    ......
    Det/DetCond/tests/refs/dd4hep_check_db_access.ref
    + 8
    − 1
    View file @ 04cd1713
    ......@@ -3,7 +3,7 @@ ApplicationMgr SUCCESS
    ====================================================================================================================================
    ApplicationMgr INFO Application Manager Configured successfully
    ToolSvc.GitSIMC... FATAL Exception with tag=ToolSvc.GitSIMCOND is caught
    ToolSvc.GitSIMC... ERROR ToolSvc.GitSIMCOND cannot resolve commit v1: revspec 'v1' not found StatusCode=FAILURE
    ToolSvc.GitSIMC... ERROR ToolSvc.GitSIMCOND cannot resolve commit upgrade/v1: revspec 'upgrade/v1' not found StatusCode=FAILURE
    ToolSvc ERROR Error initializing tool 'ToolSvc.GitSIMCOND'
    DetectorPersist... INFO Added successfully Conversion service:XmlCnvSvc
    DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml
    ......@@ -11,15 +11,22 @@ EventLoopMgr WARNING Unable to locate service "EventSelector"
    EventLoopMgr WARNING No events will be processed from external input.
    ApplicationMgr INFO Application Manager Initialized successfully
    ApplicationMgr INFO Application Manager Started successfully
    ReserveIOVDD4hep INFO Loading conditions for Run 42
    DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml']
    DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml succesfully parsed with TinyXML .....
    DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml']
    DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml succesfully parsed with TinyXML .....
    DD4hep WARNING ++ STD conditions NOT defined by client. NTP defaults taken.
    CondAlg INFO condition value:
    Validity: 0.0 -> 9223372036.854775807
    (double) par1 = 1.3
    (double) par2 = 2.1
    ReserveIOVDD4hep INFO Loading conditions for Run 62
    CondAlg INFO condition value:
    Validity: 0.0 -> 9223372036.854775807
    (double) par1 = 100.6
    (double) par2 = 101.7
    ReserveIOVDD4hep INFO Loading conditions for Run 82
    CondAlg INFO condition value:
    Validity: 0.0 -> 9223372036.854775807
    (double) par1 = 1.3
    ......
    Det/DetCond/tests/refs/dd4hep_check_db_access_bare.ref
    + 8
    − 1
    View file @ 04cd1713
    ......@@ -3,7 +3,7 @@ ApplicationMgr SUCCESS
    ====================================================================================================================================
    ApplicationMgr INFO Application Manager Configured successfully
    ToolSvc.GitSIMC... FATAL Exception with tag=ToolSvc.GitSIMCOND is caught
    ToolSvc.GitSIMC... ERROR ToolSvc.GitSIMCOND cannot resolve commit v1: revspec 'v1' not found StatusCode=FAILURE
    ToolSvc.GitSIMC... ERROR ToolSvc.GitSIMCOND cannot resolve commit upgrade/v1: revspec 'upgrade/v1' not found StatusCode=FAILURE
    ToolSvc ERROR Error initializing tool 'ToolSvc.GitSIMCOND'
    DetectorPersist... INFO Added successfully Conversion service:XmlCnvSvc
    DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml
    ......@@ -11,15 +11,22 @@ EventLoopMgr WARNING Unable to locate service "EventSelector"
    EventLoopMgr WARNING No events will be processed from external input.
    ApplicationMgr INFO Application Manager Initialized successfully
    ApplicationMgr INFO Application Manager Started successfully
    ReserveIOVDD4hep INFO Loading conditions for Run 42
    DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml']
    DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml succesfully parsed with TinyXML .....
    DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml']
    DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml succesfully parsed with TinyXML .....
    DD4hep WARNING ++ STD conditions NOT defined by client. NTP defaults taken.
    CondAlg INFO condition value:
    Validity: 0.0 -> 9223372036.854775807
    (double) par1 = 1.3
    (double) par2 = 2.1
    ReserveIOVDD4hep INFO Loading conditions for Run 62
    CondAlg INFO condition value:
    Validity: 0.0 -> 9223372036.854775807
    (double) par1 = 100.6
    (double) par2 = 101.7
    ReserveIOVDD4hep INFO Loading conditions for Run 82
    CondAlg INFO condition value:
    Validity: 0.0 -> 9223372036.854775807
    (double) par1 = 1.3
    ......
    Det/DetCond/tests/refs/dd4hep_conditions.ref
    + 7
    − 4
    View file @ 04cd1713
    ......@@ -2,15 +2,16 @@ ApplicationMgr SUCCESS
    ====================================================================================================================================
    ====================================================================================================================================
    ApplicationMgr INFO Application Manager Configured successfully
    LHCb::Det::LbDD... INFO Loading DD4hep Geometry: .../test/DD4TESTCOND/geo.xml
    DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml']
    DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/geo.xml succesfully parsed with TinyXML .....
    DocumentHandler INFO +++ Loading document URI: /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml [Resolved:'/home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml']
    DocumentHandler INFO +++ Document /home/lben/develop/dd4hep/LHCb/build.x86_64_v2-centos7-gcc10-dbg/Det/DetCond/test/DD4TESTCOND/materials.xml succesfully parsed with TinyXML .....
    DD4hep WARNING ++ STD conditions NOT defined by client. NTP defaults taken.
    LHCb::Det::LbDD... INFO Using conditions location: file://.../test/DD4TESTCOND/
    LHCb::Det::LbDD... INFO Using conditions tag: HEAD
    LHCb::Det::LbDD... INFO Using detector list: [/world]
    EventLoopMgr WARNING Unable to locate service "EventSelector"
    EventLoopMgr WARNING No events will be processed from external input.
    ApplicationMgr INFO Application Manager Initialized successfully
    ApplicationMgr INFO Application Manager Started successfully
    ReserveIOVDD4hep INFO Loading conditions for Run 42
    CondAlg INFO condition value:
    Validity: 0.0 -> 9223372036.854775807
    (double) par1 = 1.3
    ......@@ -25,6 +26,7 @@ condition value for level2 : {
    p2: 4.2
    v: 19.9204
    }
    ReserveIOVDD4hep INFO Loading conditions for Run 62
    CondAlg INFO condition value:
    Validity: 0.0 -> 9223372036.854775807
    (double) par1 = 0.6
    ......@@ -39,6 +41,7 @@ condition value for level2 : {
    p2: 3.4
    v: 13.1092
    }
    ReserveIOVDD4hep INFO Loading conditions for Run 82
    CondAlg INFO condition value:
    Validity: 0.0 -> 9223372036.854775807
    (double) par1 = 1.3
    ......
    Det/DetCond/tests/refs/empty.ref 0 → 100644
    + 0
    − 0
    View file @ 04cd1713
    GaudiConf/python/GaudiConf/QMTest/LHCbExclusions.py
    + 1
    − 0
    View file @ 04cd1713
    ......@@ -74,6 +74,7 @@ preprocessor = (
    "INFO Using conditions tag",
    "INFO Using detector list",
    "INFO Loading DD4hep Geometry",
    "Changing system of units to ROOT units",
    ],
    regexps=[
    r"HLTControlFlowMgr\s*INFO Memory pool:",
    ......
    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