Merge branch 'erodrigu-DaVinciTestsFixes' into '2017-patches'

Fixing a few more tests in DaVinciTests

See merge request !230

DaVinciTests/tests/options/InputData_Reco17_Run198660.py

@@ -2,7 +2,10 @@
 # $STRIPPINGSELECTIONSROOT/tests/data/Reco17_Run198660.py
 # Now stored in CERN-SWTEST
 
+from Gaudi.Configuration import *
 from Configurables import DaVinci
 from PRConfig import TestFileDB
 
 TestFileDB.test_file_db["2017_DaVinciTests.stripping29r2_collision17_reco17"].run(configurable=DaVinci())
+
+FileCatalog().Catalogs += [ 'xmlcatalog_file:$DAVINCITESTSROOT/tests/options/InputData_Reco17_Run198660.xml' ]

DaVinciTests/tests/options/InputData_Reco17_Run198660.xml

+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!-- Edited By PoolXMLCatalog.py -->
+<!DOCTYPE POOLFILECATALOG SYSTEM "InMemory">
+<POOLFILECATALOG>
+
+<File ID="18F90308-5C93-E711-B357-0242AC110008">
+   <physical>
+      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision17/RDST/00064899/0006/00064899_00065694_1.rdst" se="CERN-SWTEST"/>
+   </physical>
+   <logical>
+      <lfn name="/lhcb/LHCb/Collision17/RDST/00064899/0006/00064899_00065694_1.rdst"/>
+   </logical>
+</File>
+<File ID="4fb52580-933d-11e7-9e7f-001e67ddd3ca">
+   <physical>
+      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/data/2017/RAW/FULL/LHCb/COLLISION17/198660/198660_0000000148.raw" se="CERN-SWTEST"/>
+   </physical>
+   <logical>
+      <lfn name="/lhcb/data/2017/RAW/FULL/LHCb/COLLISION17/198660/198660_0000000148.raw"/>
+   </logical>
+</File>
+<File ID="0d1048f0-9341-11e7-bbb0-001e67ddd3ca">
+   <physical>
+      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/data/2017/RAW/FULL/LHCb/COLLISION17/198660/198660_0000000136.raw" se="CERN-SWTEST"/>
+   </physical>
+   <logical>
+      <lfn name="/lhcb/data/2017/RAW/FULL/LHCb/COLLISION17/198660/198660_0000000136.raw"/>
+   </logical>
+</File>
+<File ID="805A4A0C-5293-E711-870A-0242AC110006">
+   <physical>
+      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision17/RDST/00064899/0006/00064899_00065751_1.rdst" se="CERN-SWTEST"/>
+   </physical>
+   <logical>
+      <lfn name="/lhcb/LHCb/Collision17/RDST/00064899/0006/00064899_00065751_1.rdst"/>
+   </logical>
+</File>
+
+</POOLFILECATALOG>

DaVinciTests/tests/options/dimuon_testfile.py

-from GaudiConf import IOHelper
+from Configurables import DaVinci
+from PRConfig import TestFileDB
 
-IOHelper('ROOT').inputFiles([
-        'PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/freezer/lhcb/LHCb/Collision12/FULL.DST/00020330/0004/00020330_00047243_1.full.dst'
-        ])
+TestFileDB.test_file_db["2012_DaVinciTests.stripping.test_express_appconfig"].run(configurable=DaVinci())