Merge branch 'fixTests-hlt2011' into 'hlt2011-patches'

adapt tests to current QMTest environment

See merge request !1109

Phys/SelPy/tests/qmtest/selpy.qms/test_configurabloids.qmt

@@ -12,11 +12,10 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"> 
-	<text>py.test</text>
+    <text>../test_configurabloids.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_configurabloids.py</text>
       <text>--verbose</text>
     </set>
   </argument>

Phys/SelPy/tests/qmtest/selpy.qms/test_eventselection.qmt

@@ -12,11 +12,10 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"> 
-	<text>py.test</text>
+    <text>../test_eventselection.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_eventselection.py</text>
       <text>--verbose</text>
     </set>
   </argument>

Phys/SelPy/tests/qmtest/selpy.qms/test_passthroughselection.qmt

@@ -12,11 +12,10 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"> 
-	<text>py.test</text>
+    <text>../test_passthroughselection.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_passthroughselection.py</text>
       <text>--verbose</text>
     </set>
   </argument>

Phys/SelPy/tests/qmtest/selpy.qms/test_selection.qmt

@@ -12,11 +12,10 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"> 
-	<text>py.test</text>
+    <text>../test_selection.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_selection.py</text>
       <text>--verbose</text>
     </set>
   </argument>

Phys/SelPy/tests/qmtest/selpy.qms/test_selection_components.qmt

@@ -12,11 +12,10 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"> 
-	<text>py.test</text>
+    <text>../test_selection_components.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_selection_components.py</text>
       <text>--verbose</text>
     </set>
   </argument>

PhysSel/PhysSelPython/python/PhysSelPython/Wrappers.py

@@ -63,7 +63,6 @@ from SelPy.selection import EventSelection as EvtSel
 from SelPy.selection import PassThroughSelection as PassThroughSel
 from SelPy.selection import AutomaticData as autodata
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from GaudiConfUtils import configurableExists, isConfigurable
 from GaudiConfUtils import ConfigurableGenerators
 import Configurables
@@ -156,6 +155,7 @@ class AutomaticData(NamedObject, SelectionBase) :
         NamedObject.__init__(self,
                              Location.replace('/', '_'))
 
+        from Configurables import LoKi__VoidFilter as VoidFilter
         _alg = VoidFilter('SelFilter'+self.name(),
                           Code = "CONTAINS('"+Location+"')>0")
 
@@ -200,6 +200,8 @@ class VoidEventSelection(UniquelyNamedObject,
         _code = Code.replace('<Location>',
                              "'"+RequiredSelection.outputLocation()+"'")
         _code = _code.replace('\"\'', '\'').replace('\'\"', '\'').replace('\'\'','\'')
+
+        from Configurables import LoKi__VoidFilter as VoidFilter
         _alg = VoidFilter(self.name(), Code = _code)
 
         SelectionBase.__init__(self,

PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_import_wrappers.qmt

@@ -12,11 +12,10 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"> 
-    <text>py.test</text>
+    <text>../test_import_wrappers.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_import_wrappers.py</text>
       <text>--verbose</text>
     </set>
   </argument>

PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_import_wrappers_star.qmt

@@ -12,11 +12,10 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"> 
-    <text>py.test</text>
+    <text>$PHYSSELPYTHONROOT/tests/test_import_wrappers_star.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>$PHYSSELPYTHONROOT/tests/test_import_wrappers_star.py</text>
       <text>--verbose</text>
     </set>
   </argument>

PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_multi_selection_sequence.qmt

@@ -12,10 +12,9 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"> 
-	<text>py.test</text>
+    <text>../test_multi_selection_sequence.py</text>
   </argument>
   <argument name="args"><set>
-    <text>../test_multi_selection_sequence.py</text>
     <text>--verbose</text>
   </set>
   </argument>

PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_selection.qmt

@@ -12,11 +12,10 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"> 
-	<text>py.test</text>
+    <text>../test_selection.py</text>
   </argument>
   <argument name="args">
     <set>
-      <text>../test_selection.py</text>
       <text>--verbose</text>
     </set>
   </argument>

PhysSel/PhysSelPython/tests/qmtest/physselpython.qms/test_selection_sequence.qmt

@@ -12,11 +12,10 @@
 <!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"> 
-	<text>py.test</text>
+    <text>../test_selection_sequence.py</text>
   </argument>
   <argument name="args">
     <set>
-       <text>../test_selection_sequence.py</text>
        <text>--verbose</text>
     </set>
   </argument>