rx_roi also accepts sequence of 2 ints

python/tests/conftest.py

@@ -38,8 +38,18 @@ def pytest_collection_modifyitems(config, items):
         if "withdetectorsimulators" in item.keywords:
             item.add_marker(skip)
 
+#helper fixture for servers
 @pytest.fixture
-def test_with_simulators():
+def servers(request):
+    try:
+        return request.param  # comes from @pytest.mark.parametrize(..., indirect=True)
+    except AttributeError:
+        # fallback default if the test did not parametrize
+        return ['eiger', 'jungfrau', 'mythen3', 'gotthard2', 'ctb', 'moench', 'xilinx_ctb']
+    return request.param
+
+@pytest.fixture
+def test_with_simulators(servers):
     """ Fixture to automatically setup virtual detector servers for testing. """
 
     LOG_PREFIX_FNAME = '/tmp/slsDetectorPackage_virtual_PythonAPI_test'
@@ -47,7 +57,6 @@ def test_with_simulators():
 
     with open(MAIN_LOG_FNAME, 'w') as fp:
         try:
-            servers = ['moench']
             nmods = 2
             for server in servers:
                 for ninterfaces in range(1,2):

python/tests/test_pythonAPI.py

@@ -6,8 +6,19 @@ from conftest import test_with_simulators
 from slsdet import Detector
 
 @pytest.mark.withdetectorsimulators
+@pytest.mark.parametrize("servers", [["eiger"]], indirect=True)
 def test_rx_ROI(test_with_simulators):
-    """ Test setting and getting rx_ROI property of Detector class. """
+    """ Test setting and getting rx_ROI property of Detector class for moench. """
+
+    d = Detector()
+    d.rx_roi = (0, 10, 10, 20)
+    roi = d.rx_roi
+    assert roi == [(0, 10, 10, 20)]
+
+@pytest.mark.withdetectorsimulators
+@pytest.mark.parametrize("servers", [["moench"]], indirect=True)
+def test_rx_ROI_moench(test_with_simulators, servers):
+    """ Test setting and getting rx_ROI property of Detector class for moench. """
 
     d = Detector()
     d.rx_roi = (0, 10, 10, 20)
@@ -27,4 +38,21 @@ def test_rx_ROI(test_with_simulators):
     roi = d.rx_roi
     assert roi == [(-1,-1,-1,-1)] 
 
+@pytest.mark.withdetectorsimulators
+@pytest.mark.parametrize("servers", [["mythen3"]], indirect=True)
+def test_rx_ROI_mythen(test_with_simulators, servers):
+    """ Test setting and getting rx_ROI property of Detector class for mythen. """
+
+    d = Detector()
+    d.rx_roi = (0, 10)
+    roi = d.rx_roi
+    assert roi == [(0, 10, -1, -1)]
+
+    #d.rx_roi = [[5,15, 0, 1]] # not allowed for mythen3
+
+    d.rx_roi = [0,10, -1, -1]
+
+    assert d.rx_roi == [(0,10,-1,-1)]
+    
+