Merge branch 'devel20220418'

* devel20220418: tests: give zenity a bit more time to start Ensure device options are serialized to str in XML tests/extra: support qrexec target redirection for tests
QubesOS · Apr 21, 2022 · 0e7fc1f · 0e7fc1f
2 parents 23f6bcd + e5852f3
commit 0e7fc1f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/qubes/tests/extra.py b/qubes/tests/extra.py
@@ -179,20 +179,26 @@ def enable_network(self):
         """
         self.init_networking()
 
-    def qrexec_policy(self, service, source, destination, allow=True):
+    def qrexec_policy(self, service, source, destination, allow=True,
+                      target=None):
         """
         Allow qrexec calls for duration of the test
         :param service: service name
         :param source: source VM name
         :param destination: destination VM name
+        :param allow: whether allow the call
+        :param target: redirect call to this target
         :return:
         """
 
         def add_remove_rule(add=True):
             with open('/etc/qubes-rpc/policy/{}'.format(service), 'r+') as policy:
                 policy_rules = policy.readlines()
-                rule = "{} {} {}\n".format(source, destination,
-                                              'allow' if allow else 'deny')
+                rule = "{} {} {}{}\n".format(
+                    source, destination,
+                    'allow' if allow else 'deny',
+                    ' target={}'.format(target) if target else ''
+                )
                 if add:
                     policy_rules.insert(0, rule)
                 else:

diff --git a/qubes/tests/integ/basic.py b/qubes/tests/integ/basic.py
@@ -485,7 +485,7 @@ def test_000_clipboard(self):
             'zenity --text-info --editable --title={}'.format(window_title)))
 
         self.wait_for_window(window_title)
-        time.sleep(0.5)
+        time.sleep(1.5)
         test_string = "test{}".format(testvm1.xid)
 
         # Type and copy some text

diff --git a/qubes/vm/__init__.py b/qubes/vm/__init__.py
@@ -269,7 +269,7 @@ def load_extras(self):
             for node in parent.xpath('./device'):
                 options = {}
                 for option in node.xpath('./option'):
-                    options[option.get('name')] = option.text
+                    options[option.get('name')] = str(option.text)
 
                 try:
                     device_assignment = qubes.devices.DeviceAssignment(