tests: update devices API argument serialization (cont)

Part 2 of:

Device serialization for qrexec argument restrictions was fixed before,
but tests still used old method. Update tests now too.

Fixes: 6137b62 "Deserialize device from qrexec arg properly"

QubesOS/qubes-issues#10040

Author: marmarek

qubes/tests/api_admin.py

@@ -4069,7 +4069,7 @@ def test_650_vm_device_set_mode_required(self):
             value = self.call_mgmt_func(
                 b"admin.vm.device.testclass.Set.assignment",
                 b"test-vm1",
-                b"test-vm1+1234:bee",
+                b"test-vm1+1234+bee",
                 b"required",
             )
 
@@ -4113,7 +4113,7 @@ def test_651_vm_device_set_mode_ask(self):
             value = self.call_mgmt_func(
                 b"admin.vm.device.testclass.Set.assignment",
                 b"test-vm1",
-                b"test-vm1+1234:bee",
+                b"test-vm1+1234+bee",
                 b"ask-to-attach",
             )
 
@@ -4156,7 +4156,7 @@ def test_652_vm_device_set_mode_auto(self):
             value = self.call_mgmt_func(
                 b"admin.vm.device.testclass.Set.assignment",
                 b"test-vm1",
-                b"test-vm1+1234:bee",
+                b"test-vm1+1234+bee",
                 b"auto-attach",
             )
 
@@ -4194,7 +4194,7 @@ def test_653_vm_device_set_mode_unchanged(self):
             value = self.call_mgmt_func(
                 b"admin.vm.device.testclass.Set.assignment",
                 b"test-vm1",
-                b"test-vm1+1234:bee",
+                b"test-vm1+1234+bee",
                 b"required",
             )
         self.assertIsNone(value)

qubes/tests/devices_pci.py

@@ -281,7 +281,12 @@ def test_010_unassign_missing(self):
             b"dom0",
             b"admin.vm.device.pci.Unassign",
             b"testvm",
-            ("dom0+" + missing_port_id + ":" + missing_device_id).encode(),
+            (
+                "dom0+"
+                + missing_port_id
+                + "+"
+                + missing_device_id.replace(":", "+")
+            ).encode(),
         )
 
         response = self.loop.run_until_complete(