fix: Change iotlabs DEFAULT_SITE to grenoble

04-single-hop-6lowpan-icmp/test_spec04.py

@@ -46,7 +46,7 @@ def test_task01(riot_ctrl):
 @pytest.mark.iotlab_creds
 # nodes passed to riot_ctrl fixture
 @pytest.mark.parametrize(
-    'nodes', [pytest.param(['samr21-xpro', 'iotlab-m3'])], indirect=['nodes']
+    'nodes', [pytest.param(['samr21-xpro', 'iotlab-m3'], "saclay")], indirect=['nodes']
 )
 def test_task02(riot_ctrl):
     pinger, pinged = (
@@ -93,7 +93,7 @@ def test_task03(riot_ctrl):
 @pytest.mark.iotlab_creds
 # nodes passed to riot_ctrl fixture
 @pytest.mark.parametrize(
-    'nodes', [pytest.param(['samr21-xpro', 'iotlab-m3'])], indirect=['nodes']
+    'nodes', [pytest.param(['samr21-xpro', 'iotlab-m3'], "saclay")], indirect=['nodes']
 )
 def test_task04(riot_ctrl):
     pinger, pinged = (
@@ -184,7 +184,9 @@ def test_task06(riot_ctrl):
 @pytest.mark.local_only
 # nodes passed to riot_ctrl fixture
 @pytest.mark.parametrize(
-    'nodes', [pytest.param(['samr21-xpro', 'arduino-zero'])], indirect=['nodes']
+    'nodes',
+    [pytest.param(['samr21-xpro', 'arduino-zero'], "saclay")],
+    indirect=['nodes'],
 )
 def test_task07(riot_ctrl):
     pinger, pinged = (
@@ -206,7 +208,9 @@ def test_task07(riot_ctrl):
 @pytest.mark.local_only
 # nodes passed to riot_ctrl fixture
 @pytest.mark.parametrize(
-    'nodes', [pytest.param(['samr21-xpro', 'arduino-zero'])], indirect=['nodes']
+    'nodes',
+    [pytest.param(['samr21-xpro', 'arduino-zero'], "saclay")],
+    indirect=['nodes'],
 )
 def test_task08(riot_ctrl):
     pinger, pinged = (
@@ -292,7 +296,7 @@ def test_task10(riot_ctrl):
 # nodes passed to riot_ctrl fixture
 @pytest.mark.parametrize(
     'nodes',
-    [pytest.param(['nrf52840dk', 'iotlab-m3', 'iotlab-m3'])],
+    [pytest.param(['nrf52840dk', 'iotlab-m3', 'iotlab-m3'], "saclay")],
     indirect=['nodes'],
 )
 def test_task11(riot_ctrl):
@@ -334,7 +338,7 @@ def test_task11(riot_ctrl):
 @pytest.mark.iotlab_creds
 # nodes passed to riot_ctrl fixture
 @pytest.mark.parametrize(
-    'nodes', [pytest.param(['iotlab-m3', 'nrf52840dk'])], indirect=['nodes']
+    'nodes', [pytest.param(['iotlab-m3', 'nrf52840dk'], "saclay")], indirect=['nodes']
 )
 def test_task12(riot_ctrl):
     try:
@@ -363,7 +367,7 @@ def test_task12(riot_ctrl):
 @pytest.mark.iotlab_creds
 # nodes passed to riot_ctrl fixture
 @pytest.mark.parametrize(
-    'nodes', [pytest.param(['iotlab-m3', 'nrf52840dk'])], indirect=['nodes']
+    'nodes', [pytest.param(['iotlab-m3', 'nrf52840dk'], "saclay")], indirect=['nodes']
 )
 def test_task13(riot_ctrl):
     try:

08-interop/test_spec08.py

@@ -55,7 +55,7 @@ def test_task01(riot_ctrl, log_nodes):
 @pytest.mark.iotlab_creds
 # nodes passed to riot_ctrl fixture
 @pytest.mark.parametrize(
-    'nodes', [pytest.param(['nrf52840dk', 'nrf52840dk'])], indirect=['nodes']
+    'nodes', [pytest.param(['nrf52840dk', 'nrf52840dk'], "saclay")], indirect=['nodes']
 )
 def test_task03(riot_ctrl):
     # get the current directory of this file

setup.cfg

@@ -28,7 +28,8 @@ disable=
   missing-module-docstring,
   missing-class-docstring,
   missing-function-docstring,
-  not-callable  # with pytest 6 `pytest.mark`s are not seen as callable
+  not-callable,  # with pytest 6 `pytest.mark`s are not seen as callable
+  too-many-positional-arguments
 
 [tool.black]
 skip-string-normalization = true

testutils/iotlab.py

@@ -13,7 +13,7 @@
 )
 
 
-DEFAULT_SITE = 'saclay'
+DEFAULT_SITE = 'grenoble'
 IOTLAB_DOMAIN = 'iot-lab.info'
 
 

testutils/tests/test_iotlab.py

@@ -104,15 +104,15 @@ def test_check_user_credentials_unset(monkeypatch):
     "ctrl_envs,args,exp_boards",
     [
         (
-            [{"IOTLAB_NODE": "m3-23.saclay.iot-lab.info", "BOARD": "iotlab-m3"}],
+            [{"IOTLAB_NODE": "m3-23.grenoble.iot-lab.info", "BOARD": "iotlab-m3"}],
             (),
             ["iotlab-m3"],
         ),
-        ([{"IOTLAB_NODE": "m3-23.saclay.iot-lab.info"}], (), ["iotlab-m3"]),
+        ([{"IOTLAB_NODE": "m3-23.grenoble.iot-lab.info"}], (), ["iotlab-m3"]),
         ([{"BOARD": "iotlab-m3"}], (), ["iotlab-m3"]),
         (
-            [{"IOTLAB_NODE": "m3-23.saclay.iot-lab.info", "BOARD": "iotlab-m3"}],
-            ("saclay",),
+            [{"IOTLAB_NODE": "m3-23.grenoble.iot-lab.info", "BOARD": "iotlab-m3"}],
+            ("grenoble",),
             ["iotlab-m3"],
         ),
         (
@@ -124,13 +124,13 @@ def test_check_user_credentials_unset(monkeypatch):
     ],
 )
 def test_init(ctrl_envs, args, exp_boards):
-    assert testutils.iotlab.DEFAULT_SITE == "saclay"
+    assert testutils.iotlab.DEFAULT_SITE == "grenoble"
     ctrls = [MockRIOTCtrl(env) for env in ctrl_envs]
     exp = testutils.iotlab.IoTLABExperiment("test", ctrls, *args)
     if args:
         assert exp.site == args[0]
     else:
-        assert exp.site == "saclay"
+        assert exp.site == "grenoble"
     assert exp.ctrls == ctrls
     for ctrl, exp_board in zip(exp.ctrls, exp_boards):
         assert ctrl.board() == exp_board
@@ -178,8 +178,8 @@ def test_stop(monkeypatch, exp_id, expected):
     [
         ([{"BOARD": "nrf52dk"}], ["nrf52dk-5.saclay.iot-lab.info"]),
         (
-            [{"IOTLAB_NODE": "samr21-21.saclay.iot-lab.info"}],
-            ["samr21-21.saclay.iot-lab.info"],
+            [{"IOTLAB_NODE": "samr21-21.grenoble.iot-lab.info"}],
+            ["samr21-21.grenoble.iot-lab.info"],
         ),
     ],
 )