Fix two qubes-keymap.sh issues

[solardiz]

Avoid xkb option accumulation
QubesOS/qubes-issues#8230

Don't add ",us" for layout "si"
#139 (comment)

[qubesos-bot]

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.2&build=2023072014-4.2&flavor=pull-requests

New failures, excluding unstable

Compared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.2&build=2023071104-4.2&flavor=update

• system_tests_network_ipv6

  • VmIPv6Networking_debian-11: test_113_reattach_after_provider_kill (error + cleanup)
    raise exceptions.TimeoutError() from exc... TimeoutError

• system_tests_basic_vm_qrexec_gui_zfs

  • switch_pool: Failed (test died)
    # Test died: command 'qvm-shutdown --all --wait' failed at /usr/lib...

• system_tests_basic_vm_qrexec_gui_btrfs

  • TC_00_Basic: test_120_start_standalone_with_cdrom_dom0 (failure)
    self.assertFalse(self.vm.is_runni... AssertionError: True is not false

• system_tests_basic_vm_qrexec_gui

  • TC_20_NonAudio_debian-11: test_110_qrexec_filecopy_deny (error)
    qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

  • TC_20_NonAudio_fedora-38: test_115_qrexec_filecopy_no_agent (error)
    qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

• system_tests_qwt_win10@hw1

  • windows_clipboard_and_filecopy: unnamed test (unknown)
  • windows_clipboard_and_filecopy: Failed (test died)
    # Test died: no candidate needle with tag(s) 'windows-Explorer, win...

• system_tests_kde_gui_interactive

  • simple_gui_apps: unnamed test (unknown)

  • simple_gui_apps: Failed (test died)
    # Test died: no candidate needle with tag(s) 'vm-settings-app-xterm...

  • simple_gui_apps: unnamed test (unknown)

Failed tests

17 failures

• system_tests_pvgrub_salt_storage

  • [unstable] TC_41_HVMGrub_fedora-38: test_000_standalone_vm (error)
    qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

• system_tests_splitgpg

  • TC_10_Thunderbird_whonix-ws-16: test_020_send_receive_inline_with_attachment (failure)
    dogtail.tree.SearchError: descendent of [application | Thunderbird]...

• system_tests_network_ipv6

  • VmIPv6Networking_debian-11: test_113_reattach_after_provider_kill (error + cleanup)
    raise exceptions.TimeoutError() from exc... TimeoutError

  • [unstable] VmIPv6Networking_debian-11: test_203_fake_ip_inter_vm_allow (error)
    qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...

  • [unstable] VmIPv6Networking_fedora-38: test_203_fake_ip_inter_vm_allow (error)
    qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...

  • [unstable] VmIPv6Networking_fedora-38: test_540_ipv6_inter_vm (error)
    qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

• system_tests_dispvm

  • TC_20_DispVM_debian-11: test_030_edit_file (failure + cleanup)
    AssertionError: Timeout while waiting for disp[0-9]* window to show

  • [unstable] TC_20_DispVM_debian-11: test_100_open_in_dispvm (failure)
    AssertionError: Timeout while waiting for disp[0-9]* window to show

• system_tests_basic_vm_qrexec_gui_zfs

  • switch_pool: Failed (test died)
    # Test died: command 'qvm-shutdown --all --wait' failed at /usr/lib...

• system_tests_basic_vm_qrexec_gui_btrfs

  • TC_00_Basic: test_120_start_standalone_with_cdrom_dom0 (failure)
    self.assertFalse(self.vm.is_runni... AssertionError: True is not false

• system_tests_basic_vm_qrexec_gui

  • TC_20_NonAudio_debian-11: test_110_qrexec_filecopy_deny (error)
    qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

  • TC_20_NonAudio_fedora-38: test_115_qrexec_filecopy_no_agent (error)
    qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

• system_tests_qwt_win10@hw1

  • windows_clipboard_and_filecopy: unnamed test (unknown)
  • windows_clipboard_and_filecopy: Failed (test died)
    # Test died: no candidate needle with tag(s) 'windows-Explorer, win...

• system_tests_kde_gui_interactive

  • simple_gui_apps: unnamed test (unknown)

  • simple_gui_apps: Failed (test died)
    # Test died: no candidate needle with tag(s) 'vm-settings-app-xterm...

  • simple_gui_apps: unnamed test (unknown)

Fixed failures

Compared to: https://openqa.qubes-os.org/tests/77326#dependencies

19 fixed

• system_tests_whonix

  • whonixcheck: fail (unknown)
    Whonixcheck for anon-whonix failed...

  • whonixcheck: unnamed test (unknown)

  • whonixcheck: unnamed test (unknown)

• system_tests_network

  • VmNetworking_debian-11: test_203_fake_ip_inter_vm_allow (error)
    qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...

• system_tests_splitgpg

  • TC_00_Direct_fedora-38: test_081_subpacket_options (error)
    qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...

  • TC_20_Evolution_debian-11: test_000_send_receive_signed_encrypted (failure)
    assert msg_body.strip() == 'This is test message'... AssertionError

• system_tests_manager

  • VMSettingsTest: test_26_default_dispvm (failure)
    self.assertTrue(self.vm.property_... AssertionError: False is not true

• system_tests_qrexec

  • TC_00_Qrexec_whonix-gw-16: test_055_qrexec_dom0_service_abort (failure)
    AssertionError: Timeout, probably stdout wasn't closed

  • TC_00_Qrexec_whonix-ws-16: test_091_qrexec_service_socket_dom0_send (failure)
    AssertionError: service timeout, probably EOF wasn't transferred to...

• system_tests_network_ipv6

  • VmIPv6Networking_fedora-38: test_040_inter_vm (error)
    qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...

• system_tests_dispvm

  • TC_20_DispVM_fedora-38: test_010_simple_dvm_run (failure)
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError

  • TC_20_DispVM_fedora-38: test_030_edit_file (failure + cleanup)
    AssertionError: Timeout while waiting for disp[0-9]* window to show

  • TC_20_DispVM_fedora-38: test_100_open_in_dispvm (failure + cleanup)
    AssertionError: Timeout while waiting for disp[0-9]* window to show

  • TC_20_DispVM_whonix-gw-16: test_010_simple_dvm_run (skipped + cleanup)

  • TC_20_DispVM_whonix-gw-16: test_020_gui_app (skipped + cleanup)

  • TC_20_DispVM_whonix-gw-16: test_030_edit_file (skipped + cleanup)

  • TC_20_DispVM_whonix-gw-16: test_100_open_in_dispvm (skipped + cleanup)

  • TC_20_DispVM_whonix-ws-16: test_010_simple_dvm_run (failure)
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError

• system_tests_guivm_gui_interactive

  • update_templates: Failed (test died)
    # Test died: command 'curl --form upload=@template-fedora-38-xfce-v...

Unstable tests

• system_tests_whonix

  whonix_torbrowser/ (2/5 times with errors)

  • job 75173 None
  • job 76339 None
  whonix_torbrowser/ (2/5 times with errors)

  • job 75173 None
  • job 76339 None
  whonix_torbrowser/Failed (2/5 times with errors)

  • job 75173 # Test died: no candidate needle with tag(s) 'anon-whonix-tor-brows...
  • job 76339 # Test died: no candidate needle with tag(s) 'anon-whonix-tor-brows...

• system_tests_network

  VmNetworking_debian-11/test_203_fake_ip_inter_vm_allow (4/5 times with errors)

  • job 75362 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  • job 75629 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  • job 76757 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  • job 77353 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  VmNetworking_fedora-38/test_203_fake_ip_inter_vm_allow (1/5 times with errors)

  • job 75362 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  VmNetworking_debian-11/test_210_custom_ip_simple (1/5 times with errors)

  • job 75629 raise exceptions.TimeoutError() from exc... TimeoutError

• system_tests_pvgrub_salt_storage

  TC_10_VMSalt_fedora-38/test_000_simple_sls (3/5 times with errors)

  • job 75192 import pipes...
  • job 75365 import pipes...
  • job 75632 import pipes...
  TC_40_PVGrub_debian-11/test_000_standalone_vm (3/5 times with errors)

  • job 75192 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-06 06...
  • job 75365 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-13 05...
  • job 75632 AssertionError: Failed command: apt-get update && apt-get install -...
  TC_41_HVMGrub_debian-11/test_000_standalone_vm (3/5 times with errors)

  • job 75192 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-06 06...
  • job 75365 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-13 05...
  • job 75632 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-20 06...
  TC_41_HVMGrub_fedora-38/test_000_standalone_vm (2/5 times with errors)

  • job 75632 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
  • job 76760 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
  TC_42_PVHGrub_debian-11/test_000_standalone_vm (3/5 times with errors)

  • job 75192 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
  • job 75365 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
  • job 75632 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
  TC_10_VMSalt_fedora-38/test_001_multi_state_highstate (3/5 times with errors)

  • job 75192 import pipes...
  • job 75365 import pipes...
  • job 75632 import pipes...
  TC_10_VMSalt_fedora-38/test_003_update (3/5 times with errors)

  • job 75192 import pipes...
  • job 75365 import pipes...
  • job 75632 import pipes...
  TC_40_PVGrub_debian-11/test_010_template_based_vm (3/5 times with errors)

  • job 75192 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-06 06...
  • job 75365 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-13 05...
  • job 75632 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-20 06...
  TC_41_HVMGrub_debian-11/test_010_template_based_vm (3/5 times with errors)

  • job 75192 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-06 06...
  • job 75365 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-13 05...
  • job 75632 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-20 06...
  TC_42_PVHGrub_debian-11/test_010_template_based_vm (3/5 times with errors)

  • job 75192 qubes.exc.QubesVMError: qrexec-daemon startup failed: 2023-06-06 06...
  • job 75365 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
  • job 75632 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

• system_tests_splitgpg

  TC_20_Evolution_debian-11/test_000_send_receive_signed_encrypted (3/5 times with errors)

  • job 75634 assert msg_body.strip() == 'This is test message'... AssertionError
  • job 76366 assert msg_body.strip() == 'This is test message'... AssertionError
  • job 77358 assert msg_body.strip() == 'This is test message'... AssertionError
  TC_10_Thunderbird_debian-11/test_020_send_receive_inline_with_attachment (1/5 times with errors)

  • job 76762 assert received_attachment == orig_attachment... AssertionError
  TC_10_Thunderbird_fedora-38/test_020_send_receive_inline_with_attachment (2/5 times with errors)

  • job 75367 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError
  • job 76366 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError
  TC_00_Direct_fedora-38/test_081_subpacket_options (1/5 times with errors)

  • job 77358 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...

• system_tests_qrexec

  TC_00_Qrexec_debian-11/test_055_qrexec_dom0_service_abort (1/5 times with errors)

  • job 76761 AssertionError: Timeout, probably stdout wasn't closed
  TC_00_Qrexec_whonix-gw-16/test_055_qrexec_dom0_service_abort (1/5 times with errors)

  • job 77357 AssertionError: Timeout, probably stdout wasn't closed
  TC_00_Qrexec_whonix-ws-16/test_091_qrexec_service_socket_dom0_send (1/5 times with errors)

  • job 77357 AssertionError: service timeout, probably EOF wasn't transferred to...

• system_tests_network_ipv6

  VmIPv6Networking_debian-11/test_000_simple_networking (1/5 times with errors)

  • job 76758 self.assertEqual(self.run_cmd(self.testvm1, ... AssertionError: 2 != 0
  VmIPv6Networking_debian-11/test_040_inter_vm (1/5 times with errors)

  • job 76362 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  VmIPv6Networking_fedora-38/test_040_inter_vm (1/5 times with errors)

  • job 77354 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  VmIPv6Networking_debian-11/test_203_fake_ip_inter_vm_allow (3/5 times with errors)

  • job 75630 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  • job 76362 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  • job 76758 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  VmIPv6Networking_fedora-38/test_203_fake_ip_inter_vm_allow (3/5 times with errors)

  • job 75363 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  • job 75630 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  • job 77354 qubes.exc.QubesMemoryError: Not enough memory to start domain 'test...
  VmIPv6Networking_debian-11/test_540_ipv6_inter_vm (1/5 times with errors)

  • job 76362 raise exceptions.TimeoutError() from exc... TimeoutError
  VmIPv6Networking_fedora-38/test_540_ipv6_inter_vm (1/5 times with errors)

  • job 75363 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

• system_tests_dispvm

  TC_20_DispVM_fedora-38/test_010_simple_dvm_run (4/5 times with errors)

  • job 75625 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError
  • job 76357 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError
  • job 76753 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError
  • job 77366 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError
  TC_20_DispVM_whonix-gw-16/test_010_simple_dvm_run (3/5 times with errors)

  • job 76753 None
  • job 77349 None
  • job 77366 None
  TC_20_DispVM_whonix-ws-16/test_010_simple_dvm_run (3/5 times with errors)

  • job 76753 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError
  • job 77349 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError
  • job 77366 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError
  TC_20_DispVM_whonix-gw-16/test_020_gui_app (3/5 times with errors)

  • job 76753 None
  • job 77349 None
  • job 77366 None
  TC_20_DispVM_fedora-38/test_030_edit_file (4/5 times with errors)

  • job 75625 AssertionError: Timeout while waiting for disp[0-9]* window to show
  • job 76753 AssertionError: Timeout while waiting for disp[0-9]* window to show
  • job 77349 AssertionError: Timeout while waiting for disp[0-9]* window to show
  • job 77366 AssertionError: Timeout while waiting for disp[0-9]* window to show
  TC_20_DispVM_whonix-gw-16/test_030_edit_file (3/5 times with errors)

  • job 76753 None
  • job 77349 None
  • job 77366 None
  TC_20_DispVM_whonix-ws-16/test_030_edit_file (1/5 times with errors)

  • job 76753 AssertionError: Timeout while waiting for disp[0-9]* window to show
  TC_20_DispVM_debian-11/test_100_open_in_dispvm (5/5 times with errors)

  • job 75625 AssertionError: Timeout while waiting for disp[0-9]* window to show
  • job 76357 AssertionError: Timeout while waiting for disp[0-9]* window to show
  • job 76753 AssertionError: Timeout while waiting for disp[0-9]* window to show
  • job 77349 self.assertEqual(test_txt_content.s... AssertionError: b'' != b'test1'
  • job 77366 AssertionError: Timeout while waiting for disp[0-9]* window to show
  TC_20_DispVM_fedora-38/test_100_open_in_dispvm (4/5 times with errors)

  • job 76357 AssertionError: Timeout while waiting for disp[0-9]* window to show
  • job 76753 AssertionError: Timeout while waiting for disp[0-9]* window to show
  • job 77349 AssertionError: Timeout while waiting for disp[0-9]* window to show
  • job 77366 AssertionError: Timeout while waiting for disp[0-9]* window to show
  TC_20_DispVM_whonix-gw-16/test_100_open_in_dispvm (3/5 times with errors)

  • job 76753 None
  • job 77349 None
  • job 77366 None
  TC_20_DispVM_whonix-ws-16/test_100_open_in_dispvm (3/5 times with errors)

  • job 75625 AssertionError: './open-file test.txt' failed with ./open-file test...
  • job 76753 AssertionError: Timeout while waiting for disp[0-9]* window to show
  • job 77349 AssertionError: './open-file test.txt' failed with ./open-file test...

• system_tests_devices

  TC_00_List_fedora-38/test_011_list_dm_mounted (1/5 times with errors)

  • job 76752 AssertionError: 'test-dm' == 'test-dm' : Device test-inst-vm:dm-0 (...

• system_tests_basic_vm_qrexec_gui_btrfs

  TC_20_NonAudio_whonix-gw-16-pool/test_100_qrexec_filecopy (1/2 times with errors)

  • job 76764 subprocess.CalledProcessError: Command 'cp /etc/passwd /tmp/passwd'...

• system_tests_basic_vm_qrexec_gui_ext4

  TC_30_Gui_daemon/test_000_clipboard (1/5 times with errors)

  • job 75355 FileNotFoundError: [Errno 2] No such file or directory: '/var/run/q...
  TC_20_NonAudio_whonix-ws-16-pool/test_010_run_xterm (1/5 times with errors)

  • job 74643 AssertionError: Timeout while waiting for user@host window to show
  TC_20_NonAudio_whonix-ws-16-pool/test_011_run_gnome_terminal (1/5 times with errors)

  • job 74643 None
  TC_20_AudioVM_Pulse_fedora-38-pool/test_220_audio_play_pulseaudio (2/5 times with errors)

  • job 75355 AssertionError: Timeout waiting for pulseaudio start in test-inst-v...
  • job 76750 AssertionError: Timeout waiting for pulseaudio start in test-inst-v...

• system_tests_whonix@hw1

  whonix_torbrowser/ (2/5 times with errors)

  • job 75173 None
  • job 76339 None
  whonix_torbrowser/ (2/5 times with errors)

  • job 75173 None
  • job 76339 None
  whonix_torbrowser/Failed (2/5 times with errors)

  • job 75173 # Test died: no candidate needle with tag(s) 'anon-whonix-tor-brows...
  • job 76339 # Test died: no candidate needle with tag(s) 'anon-whonix-tor-brows...