Merge remote-tracking branch 'origin/pr/319'

* origin/pr/319:
  gui: set xkb_layout manually
  tests: handle legacy layout
  gui: no check in subprocess.run
  gui: handle legacy keymap setting /qubes-keyboard

qubes/ext/gui.py

@@ -79,6 +79,16 @@ class GUI(qubes.ext.Extension):
             if kbd_layout:
                 vm.untrusted_qdb.write('/keyboard-layout', kbd_layout)
 
+                # Legacy value for setting keyboard layout
+                xkb_keymap = \
+                    'xkb_keymap {\x0a\x09xkb_keycodes  { include ' \
+                    '"evdev"\x09};\x0a\x09xkb_types     { include ' \
+                    '"complete"\x09};\x0a\x09xkb_compat    { include ' \
+                    '"complete"\x09};\x0a\x09xkb_symbols   { include ' \
+                    '"pc+%s+inet(evdev)"\x09};\x0a\x09xkb_geometry  ' \
+                    '{ include "pc(pc105)"\x09};\x0a};' % kbd_layout
+                vm.untrusted_qdb.write('/qubes-keyboard', xkb_keymap)
+
         # Set GuiVM prefix
         guivm_windows_prefix = vm.features.get('guivm-windows-prefix', 'GuiVM')
         if vm.features.get('service.guivm-gui-agent', None):

qubes/tests/vm/qubesvm.py

@@ -1833,6 +1833,13 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
         vm.netvm = None
         vm.guivm = guivm
         guivm.features['keyboard-layout'] = 'fr'
+        xkb_keymap = \
+            'xkb_keymap {\x0a\x09xkb_keycodes  { include ' \
+            '"evdev"\x09};\x0a\x09xkb_types     { include ' \
+            '"complete"\x09};\x0a\x09xkb_compat    { include ' \
+            '"complete"\x09};\x0a\x09xkb_symbols   { include ' \
+            '"pc+fr+inet(evdev)"\x09};\x0a\x09xkb_geometry  ' \
+            '{ include "pc(pc105)"\x09};\x0a};'
         vm.events_enabled = True
         test_qubesdb = TestQubesDB()
         mock_qubesdb.write.side_effect = test_qubesdb.write
@@ -1843,6 +1850,7 @@ class TC_90_QubesVM(QubesVMTestsMixin, qubes.tests.QubesTestCase):
             '/name': 'test-inst-appvm',
             '/type': 'AppVM',
             '/default-user': 'user',
+            '/qubes-keyboard': xkb_keymap,
             '/keyboard-layout': 'fr',
             '/qubes-vm-type': 'AppVM',
             '/qubes-gui-domain-xid': '{}'.format(guivm.xid),