fix tests failing after mr !178

See merge request !206

GaudiHive/CMakeLists.txt

@@ -69,6 +69,7 @@ gaudi_add_test(GraphSchedulerSimpleTest
 gaudi_add_test(BrunelScenarioGraphScheduler
                FRAMEWORK options/BrunelScenarioGraphScheduler.py
                TIMEOUT 120)
+set_property(TEST GaudiHive.BrunelScenarioGraphScheduler PROPERTY SKIP_RETURN_CODE 77)
 
 # Test the AtomicSequencer
 gaudi_add_test(AtomicSequencer

GaudiHive/options/BrunelScenarioGraphScheduler.py

@@ -3,7 +3,12 @@
 from Gaudi.Configuration import *
 from Configurables import HiveWhiteBoard, HiveSlimEventLoopMgr, ForwardSchedulerSvc, AlgResourcePool
 
-from GaudiHive.precedence import precedence  # custom precedence graph, composed of CPUCrunchers
+try:
+    from GaudiHive.precedence import precedence  # custom precedence graph, composed of CPUCrunchers
+except ImportError:
+    # of versions of LCG/heptools do not provide the required pacakge networkx
+    import sys
+    sys.exit(77)  # consider the test skipped
 
 # metaconfig
 evtslots = 1

GaudiPolicy/python/GaudiTesting/BaseTest.py

@@ -780,6 +780,8 @@ for w,o,r in [
               (None, r'Service reference count check:', r'Looping over all active services...'),
               # Change of property name in Algorithm (GAUDI-1030)
               (None, r"Property(.*)'ErrorCount':", r"Property\1'ErrorCounter':"),
+              # Ignore count of declared properties (anyway they are all printed)
+              (None, r"^(.*(DEBUG|SUCCESS) List of ALL properties of .*#properties = )\d+", r"\1NN"),
               ]: #[ ("TIMER.TIMER","[0-9]+[0-9.]*", "") ]
     normalizeExamples += RegexpReplacer(o,r,w)
 
@@ -834,6 +836,8 @@ lineSkipper = LineSkipper(["//GP:",
                                         r"SUCCESS\s*Booked \d+ Histogram\(s\)",
                                         r"^ \|",
                                         r"^ ID=",
+                                        # Ignore added/removed properties
+                                        r"Property(.*)'IsIOBound':",
                                         ] )
 
 if ROOT6WorkAroundEnabled('ReadRootmapCheck'):
@@ -1113,4 +1117,3 @@ def isWinPlatform(self):
        """
    platform = GetPlatform(self)
    return "winxp" in platform or platform.startswith("win")
-