Merge pull request #1591 from idan-arm/remote-tag-value-validation

remote: tag value validation in labgrid-client

Author: Emantor

labgrid/remote/client.py

@@ -1425,7 +1425,7 @@ async def create_reservation(self):
                 raise UserError(f"'{pair}' is not a valid filter (must contain a '=')")
             if not TAG_KEY.match(k):
                 raise UserError(f"Key '{k}' in filter '{pair}' is invalid")
-            if not TAG_KEY.match(v):
+            if not TAG_VAL.match(v):
                 raise UserError(f"Value '{v}' in filter '{pair}' is invalid")
             fltr[k] = v
 

tests/test_client.py

@@ -15,7 +15,7 @@ def place(coordinator):
         spawn.close()
         assert spawn.exitstatus == 0, spawn.before.strip()
 
-    with pexpect.spawn('python -m labgrid.remote.client -p test set-tags board=bar') as spawn:
+    with pexpect.spawn('python -m labgrid.remote.client -p test set-tags board=123board') as spawn:
         spawn.expect(pexpect.EOF)
         spawn.close()
         assert spawn.exitstatus == 0, spawn.before.strip()
@@ -271,15 +271,15 @@ def test_remoteplace_target(place_acquire, tmpdir):
     t.await_resources(t.resources)
 
     remote_place = t.get_resource("RemotePlace")
-    assert remote_place.tags == {"board": "bar"}
+    assert remote_place.tags == {"board": "123board"}
 
 def test_remoteplace_target_without_env(request, place_acquire):
     from labgrid import Target
     from labgrid.resource import RemotePlace
 
     t = Target(request.node.name)
     remote_place = RemotePlace(t, name="test")
-    assert remote_place.tags == {"board": "bar"}
+    assert remote_place.tags == {"board": "123board"}
 
 def test_resource_conflict(place_acquire, tmpdir):
     with pexpect.spawn('python -m labgrid.remote.client -p test2 create') as spawn:
@@ -303,7 +303,7 @@ def test_resource_conflict(place_acquire, tmpdir):
         assert spawn.exitstatus == 0, spawn.before.strip()
 
 def test_reservation(place_acquire, tmpdir):
-    with pexpect.spawn('python -m labgrid.remote.client reserve --shell board=bar name=test') as spawn:
+    with pexpect.spawn('python -m labgrid.remote.client reserve --shell board=123board name=test') as spawn:
         spawn.expect(pexpect.EOF)
         spawn.close()
         assert spawn.exitstatus == 0, spawn.before.strip()
@@ -510,7 +510,7 @@ def test_reservation_custom_config(place, exporter, tmpdir):
             name: test
     """
     )
-    with pexpect.spawn(f'python -m labgrid.remote.client -c {p} reserve --wait --shell board=bar name=test') as spawn:
+    with pexpect.spawn(f'python -m labgrid.remote.client -c {p} reserve --wait --shell board=123board name=test') as spawn:
         spawn.expect(pexpect.EOF)
         spawn.close()
         assert spawn.exitstatus == 0, spawn.before.strip()