From d373c8dec47fd17c39de0eef7e8ff55261142cc1 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 27 Nov 2020 04:38:07 +0100
Subject: [PATCH] DataModelRunTests: Fix test failures in master.
Make sure xAOD::EventInfo gets written.
Ignore message able missing /Taginfo.
---
Control/DataModelTest/DataModelRunTests/CMakeLists.txt | 2 +-
.../DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py | 5 +++--
.../DataModelRunTests/share/xAODTestWrite_jo.py | 5 +++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Control/DataModelTest/DataModelRunTests/CMakeLists.txt b/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
index 45a3a4dd5c8..2ac805ba3c0 100644
--- a/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
+++ b/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
@@ -30,7 +30,7 @@ function (datamodel_run_test testName)
atlas_add_test( ${testName}
SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/datamodel_${testName}.sh
PROPERTIES TIMEOUT 300
- LOG_IGNORE_PATTERN "has different type than the branch|no dictionary for class|^StorageSvc +INFO|Cache alignment|Unable to locate catalog|IOVDbSvc[0-9 ]+INFO${ARG_EXTRA_IGNORE}"
+ LOG_IGNORE_PATTERN "has different type than the branch|no dictionary for class|^StorageSvc +INFO|Cache alignment|Unable to locate catalog|IOVDbSvc[0-9 ]+INFO|Invalid ./TagInfo${ARG_EXTRA_IGNORE}"
ENVIRONMENT "ATLAS_REFERENCE_TAG=DataModelRunTests/DataModelRunTestsReference-01-00-03"
)
if( ARG_DEPENDS )
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py
index 32f75aa484c..4b4285cae89 100755
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# File: share/xAODTestRead_jo.py
# Author: snyder@bnl.gov
# Date: May 2014
@@ -79,6 +77,9 @@ fullItemList+=["xAOD::ShallowAuxInfo#scopy_cinfoAux."]
fullItemList+=["DMTest::HVec#scopy_hvec"]
fullItemList+=["xAOD::ShallowAuxContainer#scopy_hvecAux."]
+fullItemList+=["xAOD::EventInfo#EventInfo"]
+fullItemList+=["xAOD::EventAuxInfo#EventInfoAux."]
+
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += ["DEFAULT_SPLITLEVEL='1'"]
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py
index 14dde8f7587..a4bb02d41b9 100755
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# File: share/xAODTestWrite_jo.py
# Author: snyder@bnl.gov
# Date: May 2014
@@ -82,6 +80,9 @@ fullItemList+=["DMTest::HAuxContainer#hvecAux."]
fullItemList+=["DMTest::HView#hview"]
fullItemList+=["DMTest::S2#S2"]
+fullItemList+=["xAOD::EventInfo#EventInfo"]
+fullItemList+=["xAOD::EventAuxInfo#EventInfoAux."]
+
# Stream's output file
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata.root', asAlg=True, noTag=True)
--
GitLab