Merge branch 'conddep.SCT_ConditionsAlgorithms-20200620' into 'master'

SCT_ConditionsAlgorithms: Fix broken conditions dependencies in tests.

See merge request atlas/athena!33982

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testReadout.py

@@ -88,6 +88,7 @@ conddb.addFolderSplitMC("SCT", "/SCT/DAQ/Config/MUR", "/SCT/DAQ/Config/MUR")
 
 from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_ReadoutTestAlg
 SCT_ReadoutTestAlg = SCT_ReadoutTestAlg()
+SCT_ReadoutTestAlg.SCT_ReadoutTool.SCT_CablingTool = ''
 
 # Module type and link status
 #SCT_ReadoutTestAlg.ModuleId = 143704064   # Endcap (default is barrel)

InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testTdaqEnabled.py

@@ -85,6 +85,12 @@ condSeq = AthSequencer("AthCondSeq")
 from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
 condSeq+=xAODMaker__EventInfoCnvAlg(OutputLevel=2)
 
+condAlgName = "SCT_CablingCondAlgFromCoraCool"
+if not hasattr(condSeq, condAlgName):
+    from AthenaCommon.CfgGetter import getAlgorithm
+    SCT_CablingCondAlgFromCoraCool = getAlgorithm(condAlgName)
+    condSeq += SCT_CablingCondAlgFromCoraCool
+
 from SCT_ConditionsTools.SCT_TdaqEnabledToolSetup import SCT_TdaqEnabledToolSetup
 sct_TdaqEnabledToolSetup = SCT_TdaqEnabledToolSetup()
 sct_TdaqEnabledToolSetup.setup()