AtlasTest/ControlTest/CMakeLists.txt

@@ -79,31 +79,31 @@ else()
 endif()
 
 atlas_add_test( StoreGateReentrant
-   SCRIPT test/StoreGateReentrant.sh
+   SCRIPT athena.py AthExStoreGateExample/StoreGateExample_Reentrant_jobOptions.py
    PROPERTIES TIMEOUT 300
    LOG_IGNORE_PATTERN "Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved" )
 
 atlas_add_test( StoreGateGen
-   SCRIPT test/StoreGateGen.sh
+   SCRIPT athena.py AthExStoreGateExample/StoreGateExample_Gen_jobOptions.py
    PROPERTIES TIMEOUT 300
    LOG_IGNORE_PATTERN "Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved" )
 
 atlas_add_test( StoreGateDFlow
-   SCRIPT test/StoreGateDFlow.sh
+   SCRIPT athena.py AthExStoreGateExample/dflow_jobo.py
    PROPERTIES TIMEOUT 300 )
 
 atlas_add_test( test_interactive_athena
-   SCRIPT test/test_interactive_athena.sh
+   SCRIPT athena.py ControlTest/test_interactive_athena.py
    PROPERTIES TIMEOUT 300 )
 
 atlas_add_test( test_cfgItemList
-                SCRIPT test/test_cfgItemList.sh )
+                SCRIPT python -m ControlTest.test_cfgItemList )
 
 atlas_add_test( test_keyStore
-                SCRIPT test/test_keyStore.sh )
+                SCRIPT python -m ControlTest.test_keyStore )
 
 atlas_add_test( test_handleTest
-                SCRIPT test/test_handleTest.sh )
+                SCRIPT athena.py AthExStoreGateExample/HandleTest_jobOptions.py )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

AtlasTest/ControlTest/share/HelloWorld.ref

-JobOptionsSvc        INFO 
-
-//##############################################################
-//
-// Job options file
-//
-//==============================================================
-
-//no EventSelector
-ApplicationMgr.Dlls   += { "AthenaServices" };
-ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
-//--------------------------------------------------------------
-// StoreGate services configuration
-//--------------------------------------------------------------
-// --> Including file StoreGate/StoreGate_jobOptions.txt
-
-
-ApplicationMgr.Dlls   += { "StoreGate", "CLIDSvc" };
-ApplicationMgr.ExtSvc += { "ClassIDSvc" };
-ApplicationMgr.ExtSvc += { "StoreGateSvc", "StoreGateSvc/DetectorStore", "StoreGateSvc/ConditionStore" };
-ApplicationMgr.ExtSvc += { "ActiveStoreSvc" };
-//FIXME uncomment to verify that your  CLIDs are good!
-//ClassIDSvc.CLIDDBFiles += { "$CLIDSVCROOT/share/clid.db" };
-
-// --> Including file IOVSvc/IOVSvc.txt
-
-
-//------------------------------------------------------------------------
-//
-// Load the Interval of Validity Service
-//
-//------------------------------------------------------------------------
-ApplicationMgr.Dlls += { "IOVSvc" };
-ApplicationMgr.ExtSvc += { "IOVSvc" };
-
-
-// <-- End of including file IOVSvc/IOVSvc.txt
-
-
-// <-- End of including file StoreGate/StoreGate_jobOptions.txt
-
-
-ApplicationMgr.ExtSvc += { "EvtPersistencySvc/EventPersistencySvc",
-			   "HistogramSvc/HistogramDataSvc"
-			 };	
-
-
-//--------------------------------------------------------------
-// Private Application Configuration options
-//--------------------------------------------------------------
-
-//load relevant libraries
-ApplicationMgr.Dlls += { "AthExHelloWorld" };
-
-//top algorithms to be run
-ApplicationMgr.TopAlg = { "HelloWorld" };
-
-//--------------------------------------------------------------
-// Uncomment the following line for tests of statically built applications
-//--------------------------------------------------------------
-////ApplicationMgr.Dlls = { };
-
-//--------------------------------------------------------------
-// Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-//--------------------------------------------------------------
-
-MessageSvc.OutputLevel      = 2;
-MessageSvc.useColors        = true;
-
-//--------------------------------------------------------------
-// Event related parameters
-//--------------------------------------------------------------
-
-// dummy event loop
-ApplicationMgr.EvtSel = "NONE";
-// Number of events to be processed (default is 10)
-ApplicationMgr.EvtMax = 10;
-
-//--------------------------------------------------------------
-// Algorithms Private Options
-//--------------------------------------------------------------
-
-// For the HelloWorld algorithm
-HelloWorld.MyInt = 42;
-HelloWorld.MyBool = true;
-HelloWorld.MyDouble = 3.14159;
-HelloWorld.MyStringVec = { "Welcome", "to", "Athena", "Framework", "Tutorial" };
-
-//==============================================================
-//
-// End of job options file
-//
-//##############################################################
-
-
-Job options successfully read in from AthExHelloWorld/HelloWorldOptions.txt
-ApplicationMgr      DEBUG Getting my own properties
-DllClassManager     DEBUG Found factory Algorithm AthenaOutputStream
-DllClassManager     DEBUG Found factory Algorithm AthenaConditionStream
-DllClassManager     DEBUG Found factory AlgContextAuditor
-ObjectManager       DEBUG Added object factory for class:AlgContextAuditor
-DllClassManager     DEBUG Found factory Service AlgContextSvc
-DllClassManager     DEBUG Found factory Service AtRndmGenSvc
-DllClassManager     DEBUG Found factory Service AthenaEventLoopMgr
-DllClassManager     DEBUG Found factory Service SimplePOSIXTimeKeeperSvc
-DllClassManager     DEBUG Loaded 7 factories from module AthenaServices
-DllClassManager     DEBUG Found factory Service ActiveStoreSvc
-DllClassManager     DEBUG Found factory Service ProxyProviderSvc
-DllClassManager     DEBUG Found factory Service StoreGateSvc
-DllClassManager     DEBUG Loaded 3 factories from module StoreGate
-DllClassManager     DEBUG Found factory Service ClassIDSvc
-DllClassManager     DEBUG Loaded 1 factories from module CLIDSvc
-DllClassManager     DEBUG Found factory Service IOVSvc
-DllClassManager     DEBUG Found factory Service IOVSvc
-ServiceManager    WARNING Service factory for type IOVSvc already declared
-DllClassManager     DEBUG Loaded 2 factories from module IOVSvc
-DllClassManager     DEBUG Found factory Algorithm HelloWorld
-DllClassManager     DEBUG Loaded 1 factories from module AthExHelloWorld
-ApplicationMgr       INFO Successfully loaded modules: AthenaServices, StoreGate, CLIDSvc, IOVSvc, AthExHelloWorld
-ApplicationMgr       INFO Application Manager Configured successfully
-ServiceManager      DEBUG Initializing service ClassIDSvc
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDSvc-00-00-08
-ClassIDSvc          DEBUG Service base class initialized successfully
-ClassIDSvc          DEBUG setTypeNameForID: type name <SG::Folder> already set for CLID 77641104
-ClassIDSvc          DEBUG setTypeNameForID: CLID <77641104> already set for type name SG::Folder
-ClassIDSvc          DEBUG setTypeNameForID: type name <EventInfo> already set for CLID 2101
-ClassIDSvc          DEBUG setTypeNameForID: CLID <2101> already set for type name EventInfo
-ClassIDSvc          DEBUG setTypeNameForID: type name <SG::Folder> already set for CLID 77641104
-ClassIDSvc          DEBUG setTypeNameForID: CLID <77641104> already set for type name SG::Folder
-ClassIDSvc          DEBUG setTypeNameForID: type name <EventInfo> already set for CLID 2101
-ClassIDSvc          DEBUG setTypeNameForID: CLID <2101> already set for type name EventInfo
-ClassIDSvc          DEBUG setTypeNameForID: type name <EventInfo> already set for CLID 2101
-ClassIDSvc          DEBUG setTypeNameForID: CLID <2101> already set for type name EventInfo
-ClassIDSvc          DEBUG setTypeNameForID: type name <EventInfo> already set for CLID 2101
-ClassIDSvc          DEBUG setTypeNameForID: CLID <2101> already set for type name EventInfo
-ClassIDSvc           INFO ClassIDSvc Initialized successfully 
-ServiceManager      DEBUG Initializing service StoreGateSvc
-StoreGateSvc        DEBUG Service base class initialized successfully
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-02-12-08
-IncidentSvc         DEBUG Service base class initialized successfully
-ProxyProviderSvc    DEBUG Service base class initialized successfully
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version StoreGate-02-12-08
-ServiceManager      DEBUG Initializing service DetectorStore
-DetectorStore       DEBUG Service base class initialized successfully
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-02-12-08
-ServiceManager      DEBUG Initializing service ConditionStore
-ConditionStore     DEBUG Service base class initialized successfully
-ConditionStore      INFO Initializing ConditionStore - package version StoreGate-02-12-08
-ServiceManager      DEBUG Initializing service ActiveStoreSvc
-ActiveStoreSvc      DEBUG Service base class initialized successfully
-ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-02-12-08
-ServiceManager      DEBUG Initializing service IOVSvc
-IOVSvc              DEBUG Initializing IOVSvc version IOVSvc-00-03-05
-IOVSvc              DEBUG Service base class initialized successfully
-IOVSvc              DEBUG Service initialized
-ServiceManager      DEBUG Initializing service EventPersistencySvc
-EventPersistenc...  DEBUG Service base class initialized successfully
-ServiceManager      DEBUG Initializing service HistogramDataSvc
-HistogramDataSvc    DEBUG Service base class initialized successfully
-HistogramPersis...   INFO "CnvServices": ["HbookHistSvc", "RootHistSvc"]
-HistogramPersis...  DEBUG Service base class initialized successfully
-HistogramPersis...WARNING Histograms saving not required.
-ServiceManager      DEBUG Service IncidentSvc already initialized
-ServiceManager      DEBUG Service ProxyProviderSvc already initialized
-ServiceManager      DEBUG Service HistogramPersistencySvc already initialized
-ServiceManager      DEBUG Initializing service AppMgrRunable
-AppMgrRunable       DEBUG Service base class initialized successfully
-ServiceManager      DEBUG Initializing service AthenaEventLoopMgr
-AthenaEventLoopMgr  DEBUG Service base class initialized successfully
-AthenaEventLoopMgr  DEBUG Creating Top Algorithm HelloWorld with name HelloWorld
-HelloWorld           INFO initialize()
-HelloWorld           INFO   MyInt =    42
-HelloWorld           INFO   MyBool =   1
-HelloWorld           INFO   MyDouble = 3.14159
-HelloWorld           INFO   MyStringVec[0] = Welcome
-HelloWorld           INFO   MyStringVec[1] = to
-HelloWorld           INFO   MyStringVec[2] = Athena
-HelloWorld           INFO   MyStringVec[3] = Framework
-HelloWorld           INFO   MyStringVec[4] = Tutorial
-AthenaEventLoopMgrWARNING Histograms saving not required.
-AthenaEventLoopMgrWARNING No EventSelector selected 
-No events will be processed from external input.
-AthenaEventLoopMgr   INFO No TimeKeeper selected. No time limit control on event loop.
-ApplicationMgr       INFO Application Manager Initialized successfully
-StoreGateSvc        DEBUG Recorded object 
- of type EventInfo(CLID 2101)
-object not modifiable when retrieved
-------------------------------  IOVSvc Proxy Map  ------------------------------
--------------------------------------------------------------------------------
-IOVSvc              DEBUG preLoadProxies()
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
-IOVSvc              DEBUG Begin Event: [R/E] = [0,1]
-IOVSvc              DEBUG start set: 
-
-IOVSvc              DEBUG stop set: 
-
-IOVSvc              DEBUG --> start set: 
-
-IOVSvc              DEBUG --> stop set: 
-
-AuditorSvc          DEBUG Service base class initialized successfully
-HelloWorld           INFO execute()
-HelloWorld          DEBUG A DEBUG message
-HelloWorld           INFO An INFO message
-HelloWorld        WARNING A WARNING message
-HelloWorld          ERROR An ERROR message
-HelloWorld          FATAL A FATAL error message
-StoreGateSvc        DEBUG Recorded object 
- of type EventInfo(CLID 2101)
-object not modifiable when retrieved
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
-IOVSvc              DEBUG Begin Event: [R/E] = [0,2]
-IOVSvc              DEBUG start set: 
-
-IOVSvc              DEBUG stop set: 
-
-IOVSvc              DEBUG --> start set: 
-
-IOVSvc              DEBUG --> stop set: 
-
-HelloWorld           INFO execute()
-HelloWorld          DEBUG A DEBUG message
-HelloWorld           INFO An INFO message
-HelloWorld        WARNING A WARNING message
-HelloWorld          ERROR An ERROR message
-HelloWorld          FATAL A FATAL error message
-StoreGateSvc        DEBUG Recorded object 
- of type EventInfo(CLID 2101)
-object not modifiable when retrieved
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
-IOVSvc              DEBUG Begin Event: [R/E] = [0,3]
-IOVSvc              DEBUG start set: 
-
-IOVSvc              DEBUG stop set: 
-
-IOVSvc              DEBUG --> start set: 
-
-IOVSvc              DEBUG --> stop set: 
-
-HelloWorld           INFO execute()
-HelloWorld          DEBUG A DEBUG message
-HelloWorld           INFO An INFO message
-HelloWorld        WARNING A WARNING message
-HelloWorld          ERROR An ERROR message
-HelloWorld          FATAL A FATAL error message
-StoreGateSvc        DEBUG Recorded object 
- of type EventInfo(CLID 2101)
-object not modifiable when retrieved
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
-IOVSvc              DEBUG Begin Event: [R/E] = [0,4]
-IOVSvc              DEBUG start set: 
-
-IOVSvc              DEBUG stop set: 
-
-IOVSvc              DEBUG --> start set: 
-
-IOVSvc              DEBUG --> stop set: 
-
-HelloWorld           INFO execute()
-HelloWorld          DEBUG A DEBUG message
-HelloWorld           INFO An INFO message
-HelloWorld        WARNING A WARNING message
-HelloWorld          ERROR An ERROR message
-HelloWorld          FATAL A FATAL error message
-StoreGateSvc        DEBUG Recorded object 
- of type EventInfo(CLID 2101)
-object not modifiable when retrieved
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
-IOVSvc              DEBUG Begin Event: [R/E] = [0,5]
-IOVSvc              DEBUG start set: 
-
-IOVSvc              DEBUG stop set: 
-
-IOVSvc              DEBUG --> start set: 
-
-IOVSvc              DEBUG --> stop set: 
-
-HelloWorld           INFO execute()
-HelloWorld          DEBUG A DEBUG message
-HelloWorld           INFO An INFO message
-HelloWorld        WARNING A WARNING message
-HelloWorld          ERROR An ERROR message
-HelloWorld          FATAL A FATAL error message
-StoreGateSvc        DEBUG Recorded object 
- of type EventInfo(CLID 2101)
-object not modifiable when retrieved
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
-IOVSvc              DEBUG Begin Event: [R/E] = [0,6]
-IOVSvc              DEBUG start set: 
-
-IOVSvc              DEBUG stop set: 
-
-IOVSvc              DEBUG --> start set: 
-
-IOVSvc              DEBUG --> stop set: 
-
-HelloWorld           INFO execute()
-HelloWorld          DEBUG A DEBUG message
-HelloWorld           INFO An INFO message
-HelloWorld        WARNING A WARNING message
-HelloWorld          ERROR An ERROR message
-HelloWorld          FATAL A FATAL error message
-StoreGateSvc        DEBUG Recorded object 
- of type EventInfo(CLID 2101)
-object not modifiable when retrieved
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
-IOVSvc              DEBUG Begin Event: [R/E] = [0,7]
-IOVSvc              DEBUG start set: 
-
-IOVSvc              DEBUG stop set: 
-
-IOVSvc              DEBUG --> start set: 
-
-IOVSvc              DEBUG --> stop set: 
-
-HelloWorld           INFO execute()
-HelloWorld          DEBUG A DEBUG message
-HelloWorld           INFO An INFO message
-HelloWorld        WARNING A WARNING message
-HelloWorld          ERROR An ERROR message
-HelloWorld          FATAL A FATAL error message
-StoreGateSvc        DEBUG Recorded object 
- of type EventInfo(CLID 2101)
-object not modifiable when retrieved
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
-IOVSvc              DEBUG Begin Event: [R/E] = [0,8]
-IOVSvc              DEBUG start set: 
-
-IOVSvc              DEBUG stop set: 
-
-IOVSvc              DEBUG --> start set: 
-
-IOVSvc              DEBUG --> stop set: 
-
-HelloWorld           INFO execute()
-HelloWorld          DEBUG A DEBUG message
-HelloWorld           INFO An INFO message
-HelloWorld        WARNING A WARNING message
-HelloWorld          ERROR An ERROR message
-HelloWorld          FATAL A FATAL error message
-StoreGateSvc        DEBUG Recorded object 
- of type EventInfo(CLID 2101)
-object not modifiable when retrieved
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
-IOVSvc              DEBUG Begin Event: [R/E] = [0,9]
-IOVSvc              DEBUG start set: 
-
-IOVSvc              DEBUG stop set: 
-
-IOVSvc              DEBUG --> start set: 
-
-IOVSvc              DEBUG --> stop set: 
-
-HelloWorld           INFO execute()
-HelloWorld          DEBUG A DEBUG message
-HelloWorld           INFO An INFO message
-HelloWorld        WARNING A WARNING message
-HelloWorld          ERROR An ERROR message
-HelloWorld          FATAL A FATAL error message
-StoreGateSvc        DEBUG Recorded object 
- of type EventInfo(CLID 2101)
-object not modifiable when retrieved
-StoreGateSvc        DEBUG retrieve(default): Retrieved const handle to default object 
- of type EventInfo(CLID 2101)
-IOVSvc              DEBUG Begin Event: [R/E] = [0,10]
-IOVSvc              DEBUG start set: 
-
-IOVSvc              DEBUG stop set: 
-
-IOVSvc              DEBUG --> start set: 
-
-IOVSvc              DEBUG --> stop set: 
-
-HelloWorld           INFO execute()
-HelloWorld          DEBUG A DEBUG message
-HelloWorld           INFO An INFO message
-HelloWorld        WARNING A WARNING message
-HelloWorld          ERROR An ERROR message
-HelloWorld          FATAL A FATAL error message
-HelloWorld           INFO finalize()
-IOVSvc               INFO Service finalised successfully
-ClassIDSvc          DEBUG finalize: wrote 3 entries to output CLIDDB file: ./CLIDDBout.txt
-ApplicationMgr       INFO Application Manager Finalized successfully

AtlasTest/ControlTest/share/pre.sh

-source ../cmt/setup.sh

AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx

@@ -37,8 +37,6 @@
 #include "GaudiKernel/ClassID.h"
 
 
-#include <string>
-
 using namespace Athena_test;
 using std::cerr;
 using std::cout;

AtlasTest/ControlTest/test/StoreGateDFlow.sh

-#!/bin/bash
-#
-# $Id: StoreGateDFlow.sh 729263 2016-03-11 17:34:05Z krasznaa $
-#
-# Script running the StoreGateDFlow intergration test.
-#
-
-# Transmit errors:
-set -e
-
-# Run the job:
-athena.py AthExStoreGateExample/dflow_jobo.py

AtlasTest/ControlTest/test/StoreGateGen.sh

-#!/bin/bash
-#
-# $Id: StoreGateGen.sh 729263 2016-03-11 17:34:05Z krasznaa $
-#
-# Script running the StoreGateGen intergration test.
-#
-
-# Transmit errors:
-set -e
-
-# Run the job:
-athena.py AthExStoreGateExample/StoreGateExample_Gen_jobOptions.py

AtlasTest/ControlTest/test/StoreGateReentrant.sh

-#!/bin/bash
-#
-# $Id: StoreGateReentrant.sh 729263 2016-03-11 17:34:05Z krasznaa $
-#
-# Script running the StoreGateReentrant intergration test.
-#
-
-# Transmit errors:
-set -e
-
-# Run the job:
-athena.py AthExStoreGateExample/StoreGateExample_Reentrant_jobOptions.py

AtlasTest/ControlTest/test/TestControl.xml

-<?xml version="1.0"?>
-<atn>
-   <TEST name="ControlTest" type="makecheck" suite="Examples">
-      <package>AtlasTest/ControlTest</package>
-      <timelimit>20</timelimit>
-      <author> Paolo Calafiura </author>
-      <mailto> pcalafiura@lbl.gov </mailto>
-      <expectations>
-         <errorMessage> Athena exited abnormally </errorMessage>
-         <errorMessage> Terminating event processing loop due to errors </errorMessage>
-         <successMessage>check ok.</successMessage>
-
-         <returnValue>0</returnValue>
-      </expectations>
-   </TEST>
-</atn>

AtlasTest/ControlTest/test/test_cfgItemList.sh

-#!/bin/bash
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
-#
-# Script for test_cfgItemList.
-#
-
-# Return the correct code:
-set -e
-
-# Run the test:
-python -c'import ControlTest.test_cfgItemList'

AtlasTest/ControlTest/test/test_handleTest.sh

-#!/bin/bash
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
-#
-# Script for test_handleTest
-#
-
-# Return the correct code:
-set -e
-
-# Run the test:
-athena.py AthExStoreGateExample/HandleTest_jobOptions.py

AtlasTest/ControlTest/test/test_interactive_athena.sh

-#!/bin/bash
-#
-# $Id: test_interactive_athena.sh 729263 2016-03-11 17:34:05Z krasznaa $
-#
-# Script running the test_interactive_athena intergration test.
-#
-
-# Transmit errors:
-set -e
-
-# Run the job:
-athena.py ControlTest/test_interactive_athena.py

AtlasTest/ControlTest/test/test_keyStore.sh

-#!/bin/bash
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
-#
-# Script for test_keyStore.
-#
-
-# Return the correct code:
-set -e
-
-# Run the test:
-python -c'import ControlTest.test_keyStore'

AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt

@@ -27,22 +27,20 @@ atlas_add_component( AthenaPoolTest
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
 
-
+# Tests in the package:
 function (athenapooltest_run_test testName jo pattern)
-  cmake_parse_arguments( ARG "" "DEPENDS" "" ${ARGN} )
+  cmake_parse_arguments( ARG "" "" "DEPENDS" ${ARGN} )
 
-  configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/test/athenapooltest_test.sh.in
-                  ${CMAKE_CURRENT_BINARY_DIR}/athenapooltest_${testName}.sh
-                  @ONLY )
   atlas_add_test( ${testName}
-                  SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/athenapooltest_${testName}.sh
-                  ENVIRONMENT "ATLAS_REFERENCE_TAG=AthenaPoolTest/AthenaPoolTest-01-00-09"
-                  POST_EXEC_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/test/post_check_with_select.sh ${testName} ${pattern}"
-                  PROPERTIES TIMEOUT 900
-                   )
+                  SCRIPT athena.py AthenaPoolTest/${jo}.py
+                  LOG_SELECT_PATTERN ${pattern}
+                  LOG_IGNORE_PATTERN "DEBUG Try item:|AthenaAttribute.*DB=|AtlasRelease|Release version"
+                  PROPERTIES TIMEOUT 900 )
   if( ARG_DEPENDS )
-    set_tests_properties( AthenaPoolTest_${testName}_ctest
-                          PROPERTIES DEPENDS AthenaPoolTest_${ARG_DEPENDS}_ctest )
+    foreach( _dep ${ARG_DEPENDS} )
+      set_tests_properties( AthenaPoolTest_${testName}_ctest
+                            PROPERTIES DEPENDS AthenaPoolTest_${_dep}_ctest )
+    endforeach()
   endif()
 endfunction (athenapooltest_run_test)
 
@@ -56,26 +54,25 @@ athenapooltest_run_test( AthenaPoolTestRead AthenaPoolTestRead
 
 # Write with DoubleEventSelector
 athenapooltest_run_test( AthenaPoolTestWriteDoubleSelector AthenaPoolTestWriteDoubleSelector
-                         "'^..DoubleEvent|^..SecondaryEvent|^..AthenaPoolTest'"
-                         DEPENDS AthenaPoolTestRead)
+                         "^DoubleEvent|^SecondaryEvent|^AthenaPoolTest" )
 athenapooltest_run_test( AthenaPoolTestReadDoubleSelector AthenaPoolTestReadDoubleSelector
-                         "'^..DoubleEvent|^..SecondaryEvent|^..AthenaPoolTest'"
+                         "^DoubleEvent|^SecondaryEvent|^AthenaPoolTest"
                          DEPENDS AthenaPoolTestWriteDoubleSelector )
 
 # Add on test of navigation still using simple objects:
 # AthenaPoolTestWrite - Step2 - rewrite part in another file
 # DoubleEventSelector
 athenapooltest_run_test( AthenaPoolTestStep2WriteDoubleSelector AthenaPoolTestStep2WriteDoubleSelector
-                         "'^..DoubleEvent|^..SecondaryEvent|^..AthenaPoolTest'"
-                         DEPENDS AthenaPoolTestReadDoubleSelector )
+                         "^DoubleEvent|^SecondaryEvent|^AthenaPoolTest"
+                         DEPENDS AthenaPoolTestWriteDoubleSelector )
 # normal EventSelector
 athenapooltest_run_test( AthenaPoolTestStep2Write AthenaPoolTestStep2Write
-                         "^..AthenaPoolTestD"
-                         DEPENDS AthenaPoolTestStep2WriteDoubleSelector )
+                         "^AthenaPoolTestD"
+                         DEPENDS AthenaPoolTestWrite )
 
 # Copy the Step2 file
 #athenapooltest_run_test( AthenaPoolTestCopy AthenaPoolTestCopy
-#                         "^..Stream1" )
+#                         "^Stream1" )
 # 
 # Remove the Step2 file and read the copy
 #athenapooltest_run_test( AthenaPoolTestReadAfterCopy AthenaPoolTestReadAfterCopy
@@ -83,9 +80,9 @@ athenapooltest_run_test( AthenaPoolTestStep2Write AthenaPoolTestStep2Write
 # 
 # Write/read out PileUpEventInfo:
 #athenapooltest_run_test( PileUpEventInfoWrite PileUpEventInfoWrite
-#                         "^..PileUpEventInfo" )
+#                         "^PileUpEventInfo" )
 #athenapooltest_run_test( PileUpEventInfoRead PileUpEventInfoRead
-#                         "^..PileUpEventInfo" )
+#                         "^PileUpEventInfo" )
 # 
 # 
 # 
@@ -97,39 +94,35 @@ athenapooltest_run_test( AthenaPoolTestStep2Write AthenaPoolTestStep2Write
 
 # Test write/read of indet rdos:
 athenapooltest_run_test( InDetRawDataWriter InDetRawDataWriter_jobOptions
-                         "InDetRawDataFak"
-                         DEPENDS AthenaPoolTestStep2Write )
+                         "InDetRawDataFak" )
 athenapooltest_run_test( InDetRawDataRead InDetRawDataReader_jobOptions
                          "InDetRawDataFak"
                          DEPENDS InDetRawDataWriter )
 
 # Test write/read of LAr cell
 athenapooltest_run_test( LArCellContWriter LArCellContWriter_jobOptions
-                         "LArCellContFake"
-                         DEPENDS InDetRawDataRead )
+                         "LArCellContFake" )
 athenapooltest_run_test( LArCellContRead LArCellContReader_jobOptions
                          "LArCellContFake"
                          DEPENDS LArCellContWriter )
 
 # Read two RDOs with the DoubleEventSelector
 athenapooltest_run_test( ReadRDODoubleSelector ReadRDODoubleSelector
-                         "'^..DoubleEvent|^..SecondaryEvent|^..RDOReader'"
-                         DEPENDS LArCellContRead )
+                         "^DoubleEvent|^SecondaryEvent|^RDOReader"
+                         DEPENDS InDetRawDataWriter LArCellContWriter )
 athenapooltest_run_test( ReadCombinedRDO ReadCombinedRDO
-                         "'^..DoubleEvent|^..SecondaryEvent|^..LArCellContFake|^..InDetRawDataFak'"
+                         "^DoubleEvent|^SecondaryEvent|^LArCellContFake|^InDetRawDataFak"
                          DEPENDS ReadRDODoubleSelector )
 
 # Test basic overlay algorithms with DoubleEventSelector
 athenapooltest_run_test( DoubleEventSelectorOverlayTest DoubleEventSelectorOverlayTest
-                         "'^..DoubleEvent|^..SecondaryEvent|^..AthenaPoolAddr|^..Stream1|Found HelperTools'"
-                         DEPENDS ReadCombinedRDO )
+                         "^DoubleEvent|^SecondaryEvent|^AthenaPoolAddr|^Stream1|Found HelperTools" )
 
 # AthenaMT test for DoubleEventSelector
 atlas_add_test( DoubleEventSelectorOverlayTestMT
-                SCRIPT athena.py AthenaPoolTest/DoubleEventSelectorOverlayTest.py --threads=4
-                PROPERTIES TIMEOUT 900
-                POST_EXEC_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/test/post_check_with_select.sh \
-                                  DoubleEventSelectorOverlayTestMT '^..DoubleEvent.*WARNING|ERROR'")
+                SCRIPT athena.py --threads=4 -c \"outputFile=\'OverlayRDOMT.root\'\" AthenaPoolTest/DoubleEventSelectorOverlayTest.py
+                LOG_SELECT_PATTERN "^DoubleEvent.*WARNING|ERROR"
+                PROPERTIES TIMEOUT 900 )
 
 # Test of explicit collection write/read
 #athenapooltest_run_test( LArCellContWriteReg LArCellContWriter_jobOptionsReg
@@ -148,10 +141,10 @@ atlas_add_test( DoubleEventSelectorOverlayTestMT
 # 
 # write/read test of calo clusters
 #athenapooltest_run_test( CaloClusterWriter CaloClusterWriter_jobOptions
-#                         "^..CaloClusterFakeWriter"
+#                         "^CaloClusterFakeWriter"
 #                         DEPENDS LArCellContRead  )
 #athenapooltest_run_test( CaloClusterReader CaloClusterReader_jobOptions
-#                         "^..CaloClusterFakeWriter"
+#                         "^CaloClusterFakeWriter"
 #                         DEPENDS CaloClusterWriter  )
 # 
 # Test ElementLinks across files
@@ -169,7 +162,7 @@ atlas_add_test( DoubleEventSelectorOverlayTestMT
 # 
 # AthenaPoolTestWrite - write out implicit collection with athena pool test data
 #athenapooltest_run_test( AthenaPoolTestWrite2 AthenaPoolTestWrite
-#                         "^..AthenaPoolTestD" )
+#                         "^AthenaPoolTestD" )
 # LArCellContWriteRegStep2 - write out explicit collection with LArCellCont
 #athenapooltest_run_test( LArCellContWriteRegStep2 LArCellContWriter_jobOptionsRegStep2
 #                         "LArCellContFake" )
@@ -186,20 +179,19 @@ atlas_add_test( DoubleEventSelectorOverlayTestMT
 
 # Check for adding DetDescr tags to event info object:
 athenapooltest_run_test( EventInfoWrite EventInfoWrite
-                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
-                         DEPENDS DoubleEventSelectorOverlayTest )
+                         "^TagInfoMgr|^EventInfoWriter" )
 athenapooltest_run_test( EventInfoWriteStep2 EventInfoWriteStep2
-                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         "^TagInfoMgr|^EventInfoWriter"
                          DEPENDS EventInfoWrite )
 athenapooltest_run_test( EventInfoWriteStep3 EventInfoWriteStep3
-                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         "^TagInfoMgr|^EventInfoWriter"
                          DEPENDS EventInfoWriteStep2 )
 athenapooltest_run_test( EventInfoWriteStep4 EventInfoWriteStep4
-                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         "^TagInfoMgr|^EventInfoWriter"
                          DEPENDS EventInfoWriteStep3 )
 athenapooltest_run_test( EventInfoWriteStep5 EventInfoWriteStep5
-                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         "^TagInfoMgr|^EventInfoWriter"
                          DEPENDS EventInfoWriteStep4 )
 athenapooltest_run_test( EventInfoRead EventInfoRead
-                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         "^TagInfoMgr|^EventInfoWriter"
                          DEPENDS EventInfoWriteStep5 )

AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.py

@@ -45,8 +45,8 @@ theApp.EvtMax = 5
 #--------------------------------------------------------------
 from AthenaPoolTest.AthenaPoolTestConf import AthenaPoolTestDataWriter
 topSequence += AthenaPoolTestDataWriter( "AthenaPoolTestDataWriter" )
-AthenaPoolTestDataWriter.PartialCreate = TRUE
-AthenaPoolTestDataWriter.ReadOtherHalf = TRUE
+AthenaPoolTestDataWriter.PartialCreate = True
+AthenaPoolTestDataWriter.ReadOtherHalf = True
 # Try to also read in the first half that is going to be written out
 # again => this should produce an error
 #AthenaPoolTestDataWriter.ReadFirstHalf = TRUE
@@ -57,18 +57,18 @@ AthenaPoolTestDataWriter.ReadOtherHalf = TRUE
 include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
 include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" )
 
-printfunc (fullItemList)
+print(fullItemList)
 
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
 Stream1 = AthenaPoolOutputStream( "Stream1", noTag=True )
 
 # Run OutputStream as an algorithm
-topSequence += AthenaPoolOutputStream( "Stream1", noTag=True )
+topSequence += Stream1
 # Must make sure that no OutStream's have been declared
-theApp.OutStream     = []; 
+theApp.OutStream     = []
 # Stream's output file
 Stream1.WritingTool = "AthenaOutputStreamTool"
-Stream1.OutputFile  = "SimplePoolFile1.root"
+Stream1.OutputFile  = "SimplePoolFile4.root"
 # List of DO's to write out
 #Stream1.ItemList   += fullItemList
 Stream1.ItemList   += ["EventInfo#*"]
@@ -79,7 +79,7 @@ Stream1.ItemList   += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_2"]
 Stream1.ItemList   += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_3"]
 Stream1.ItemList   += ["AthenaPoolTestMatrix#*"]
 
-printfunc (Stream1.ItemList)
+print(Stream1.ItemList)
 
 #--------------------------------------------------------------
 # Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )

AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py

@@ -56,8 +56,8 @@ theApp.EvtMax = 5
 #--------------------------------------------------------------
 from AthenaPoolTest.AthenaPoolTestConf import AthenaPoolTestDataWriter
 topSequence += AthenaPoolTestDataWriter( "AthenaPoolTestDataWriter" )
-AthenaPoolTestDataWriter.PartialCreate = TRUE
-AthenaPoolTestDataWriter.ReadOtherHalf = TRUE
+AthenaPoolTestDataWriter.PartialCreate = True
+AthenaPoolTestDataWriter.ReadOtherHalf = True
 
 #--------------------------------------------------------------
 # Output options
@@ -66,13 +66,13 @@ AthenaPoolTestDataWriter.ReadOtherHalf = TRUE
 include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
 include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py" )
 
-printfunc (fullItemList)
+print(fullItemList)
 
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
 Stream3 = AthenaPoolOutputStream( "Stream3", noTag=True )
 
 # Run OutputStream as an algorithm
-topSequence += AthenaPoolOutputStream( "Stream3", noTag=True )
+topSequence += Stream3
 # Must make sure that no OutStream's have been declared
 theApp.OutStream     = []; 
 # Stream's output file
@@ -87,7 +87,7 @@ Stream3.ItemList   += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_2"]
 Stream3.ItemList   += ["IAthenaPoolTestCollection#AthenaPoolTestCollection_3"]
 Stream3.ItemList   += ["AthenaPoolTestMatrix#*"]
 
-printfunc (Stream3.ItemList)
+print(Stream3.ItemList)
 
 # Change output file catalog to avoid collisions.
 from PoolSvc import PoolSvcConf

AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py

@@ -108,7 +108,7 @@ from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
 Stream1 = AthenaPoolOutputStream( "Stream1", asAlg=True, noTag=True )
 Stream1.OutputLevel = INFO
 
-Stream1.OutputFile  = "OutputRDO.root"
+Stream1.OutputFile  = locals().get("outputFile", "OverlayRDO.root")
 # List of DO's to write out
 Stream1.ItemList =  []
 Stream1.ItemList += ["McEventCollection#TruthEvent"]

AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.ref

@@ -58,7 +58,7 @@ Stream1.Stream1...   INFO Initializing Stream1.Stream1Tool - package version Ath
 AthenaPoolAddre...  DEBUG Cannot retrieve DataHeader from DetectorStore.
 AthenaPoolAddre...  DEBUG Cannot retrieve DataHeader from DetectorStore.
 Stream1              INFO Found HelperTools = PrivateToolHandleArray(['Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
-Stream1              INFO Data output: OutputRDO.root
+Stream1              INFO Data output: OverlayRDO.root
 Stream1              INFO I/O reinitialization...
 DoubleEventSele...  DEBUG Property update for OutputLevel : new value = 2
 DoubleEventSele...  DEBUG Initializing DoubleEventSelector
@@ -182,8 +182,8 @@ ClassIDSvc           INFO  getRegistryEntries: read 180 CLIDRegistry entries for
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO >   Access   DbDomain     UPDATE    [ROOT_All] 
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   CREATE    [ROOT_All] 22B32F76-1345-524A-B55B-D789FB399093
-Domain[ROOT_All]     INFO                           OutputRDO.root
-RootDatabase.open    INFO OutputRDO.root File version:61800
+Domain[ROOT_All]     INFO                           OverlayRDO.root
+RootDatabase.open    INFO OverlayRDO.root File version:61800
 StorageSvc           INFO Building shape according to reflection information using shape ID for:
 StorageSvc           INFO DataHeader_p6 [4DDBD295-EFCE-472A-9EC8-15CD35A9EB8D]
 StorageSvc           INFO Building shape according to reflection information using shape ID for:
@@ -887,7 +887,7 @@ Stream1              INFO Metadata records written: 11
 Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 8BCD9728-EB56-6042-AFDF-61C0C379D70E
 /home/sss/nobac...   INFO Database being retired...
 Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 9553B87B-1832-3346-A65E-916E6C1DEAB5
-OutputRDO.root       INFO Database being retired...
+OverlayRDO.root      INFO Database being retired...
 Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   CREATE    [ROOT_All] 22B32F76-1345-524A-B55B-D789FB399093
 Domain[ROOT_All]     INFO >   Deaccess DbDomain     UPDATE    [ROOT_All] 
 ApplicationMgr       INFO Application Manager Stopped successfully