clear_roi after every test to bring it back to default state, test passing multiple parameters

python/tests/conftest.py

@@ -46,8 +46,8 @@ def servers(request):
         return request.param  # comes from @pytest.mark.parametrize(..., indirect=True)
     except AttributeError:
         # fallback default if the test did not parametrize
-        return [['moench', 1]]
-    return request.param  # comes from @pytest.mark.parametrize(..., indirect=True)
+        return [['eiger', 1], ['jungfrau', 1], ['jungfrau', 2], ['mythen3',1], ['gotthard2',1], ['ctb',1], ['moench',1], ['moench',2],['xilinx_ctb',1]]
+    return request.param  
 
 @pytest.fixture() 
 def test_with_specific_simulator(servers):

python/tests/test_pythonAPI.py

@@ -13,7 +13,7 @@ detectorType = slsDetectorDefs.detectorType
 
 @pytest.mark.withdetectorsimulators
 def test_rx_ROI(test_with_simulators):
-     #Test rx_ROI property of Detector class. 
+    """ Test rx_ROI property of Detector class. """
 
     d = Detector()
     if d.type == detectorType.CHIPTESTBOARD or d.type == detectorType.XILINX_CHIPTESTBOARD:
@@ -29,6 +29,7 @@ def test_rx_ROI(test_with_simulators):
         d.rx_roi = [0,10, -1, -1]
 
         assert d.rx_roi == [(0,10,-1,-1)]
+        d.rx_clearroi()
     else: 
 
         d.rx_roi = (0, 10, 10, 20)
@@ -47,8 +48,7 @@ def test_rx_ROI(test_with_simulators):
 
         d.rx_clearroi() 
         roi = d.rx_roi
-        assert roi == [(-1,-1,-1,-1)] 
-
+        assert roi == [(-1,-1,-1,-1)]  
 
 @pytest.mark.withdetectorsimulators
 @pytest.mark.parametrize("servers", [["moench", 1]], indirect=True)
@@ -58,6 +58,13 @@ def test_type(test_with_specific_simulator):
     assert d.type == detectorType.MOENCH
 
 
+@pytest.mark.withdetectorsimulators
+@pytest.mark.parametrize("servers", [["moench", 1], ["jungfrau", 1]], indirect=True)
+def test_numinterfaces(test_with_specific_simulator):
+
+    d = Detector()
+    assert d.numinterfaces == 1
+