tests: adjust error handling

[marmarek]

Don't use 'finally' for code that shouldn't run if both normal and
fallback methods failed. Simply move it outside of the 'try' block.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 79.20%. Comparing base (ab89d86) to head (2303fff).
Report is 6 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main      #22   +/-   ##
=======================================
  Coverage   79.20%   79.20%           
=======================================
  Files           3        3           
  Lines        1433     1433           
=======================================
  Hits         1135     1135           
  Misses        298      298           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[qubesos-bot]

OpenQA test summary

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

Test run included the following:

• Apply fix for devices without legacy IRQ qubes-vmm-xen#205 (QubesOS/qubes-vmm-xen@4426d1d)
• Reproduce bug in qrexec tests qubes-core-admin#661 (QubesOS/qubes-core-admin@87f187d)
• tests: adjust error handling #22 (2303fff)
• Add builderv2 and win10/11 support qubes-installer-qubes-os-windows-tools#4 (QubesOS/qubes-installer-qubes-os-windows-tools@955a85a)
• Use new devices API to list PCI devices qubes-mgmt-salt-base#19 (QubesOS/qubes-mgmt-salt-base@56e8148)
• Add Debug Console to Qui Domains systray widget qubes-desktop-linux-manager#249 (QubesOS/qubes-desktop-linux-manager@203be8c)
• ext/pci: implement PCI path for device identification qubes-core-admin#667 (QubesOS/qubes-core-admin@69cea57)
• Add Arch packaging qubes-core-admin-client#332 (QubesOS/qubes-core-admin-client@e22c531)
• tests: minor fixes qubes-core-admin#670 (QubesOS/qubes-core-admin@d09383b)
• add a warning box when connecting an anon vm to a non-anon gateway qubes-manager#411 (QubesOS/qubes-manager@03a8461)
• qvm-pci: optionally list SBDF of listed devices qubes-core-admin-client#347 (QubesOS/qubes-core-admin-client@6dd1258)
• q-dev: load frontend domain on vm loading qubes-core-admin#671 (QubesOS/qubes-core-admin@b83d9ab)
• tests: updates for Debian-12's Thunderbird qubes-app-linux-split-gpg#104 (QubesOS/qubes-app-linux-split-gpg@e723bd6)
• Improve and fix Settings App icons qubes-manager#419 (QubesOS/qubes-manager@9cd7bec)

New failures, excluding unstable

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

• system_tests_kde_gui_interactive

  • gui_keyboard_layout: wait_serial (wait serial expected)
    # wait_serial expected: "echo -e '[Layout]\nLayoutList=us,de' | sud...

  • gui_keyboard_layout: Failed (test died)
    # Test died: command 'test "$(cd ~user;ls e1*)" = "$(qvm-run -p wor...

• system_tests_suspend@hw1

  • suspend: Failed (test died)
    # Test died: command 'qvm-run --no-gui -p -u root sys-net "command ...

• system_tests_qwt_win10_seamless@hw13

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

• system_tests_qrexec

  • TC_00_Qrexec_whonix-gateway-17: test_065_qrexec_exit_code_vm (failure)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^... AssertionError: b'125\n' != b'0\n'

Failed tests

6 failures

• system_tests_kde_gui_interactive

  • gui_keyboard_layout: wait_serial (wait serial expected)
    # wait_serial expected: "echo -e '[Layout]\nLayoutList=us,de' | sud...

  • gui_keyboard_layout: Failed (test died)
    # Test died: command 'test "$(cd ~user;ls e1*)" = "$(qvm-run -p wor...

• system_tests_suspend@hw1

  • suspend: Failed (test died)
    # Test died: command 'qvm-run --no-gui -p -u root sys-net "command ...

• system_tests_qwt_win10_seamless@hw13

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

• system_tests_qrexec

  • TC_00_Qrexec_whonix-gateway-17: test_065_qrexec_exit_code_vm (failure)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^... AssertionError: b'125\n' != b'0\n'

Fixed failures

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

14 fixed

• system_tests_whonix

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

  • whonixcheck: unnamed test (unknown)

• system_tests_suspend

  • suspend: unnamed test (unknown)
  • suspend: Failed (test died)
    # Test died: no candidate needle with tag(s) 'SUSPEND-FAILED' match...

• system_tests_kde_gui_interactive

  • clipboard_and_web: unnamed test (unknown)

  • clipboard_and_web: Failed (test died)
    # Test died: no candidate needle with tag(s) 'qubes-website' matche...

  • clipboard_and_web: wait_serial (wait serial expected)
    # wait_serial expected: "lspci; echo 2E8vz-\$?-"...

• system_tests_guivm_vnc_gui_interactive

  • gui_filecopy: unnamed test (unknown)
  • gui_filecopy: Failed (test died)
    # Test died: no candidate needle with tag(s) 'files-work' matched...

• system_tests_whonix@hw7

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

  • whonixcheck: unnamed test (unknown)

• system_tests_qrexec

  • TC_00_Qrexec_fedora-41-xfce: test_081_qrexec_service_argument_allow_specific (error)
    subprocess.CalledProcessError: Command '/usr/lib/qubes/qrexec-clien...

• system_tests_basic_vm_qrexec_gui

  • TC_20_NonAudio_whonix-gateway-17: test_300_bug_1028_gui_memory_pinning (failure)
    AssertionError: Dom0 window doesn't match VM window content, saved ...

• system_tests_audio

  • TC_20_AudioVM_Pulse_whonix-workstation-17: test_252_audio_playback_audiovm_switch_hvm (failure)
    AssertionError: only silence detected, no useful audio data

Unstable tests

Performance Tests

Performance degradation:

14 performance degradations

• debian-12-xfce_exec: 8.03 :small_red_triangle_up: ( previous job: 7.12, degradation: 112.86%)
• debian-12-xfce_exec-data-duplex-root: 91.11 :small_red_triangle_up: ( previous job: 82.72, degradation: 110.15%)
• whonix-gateway-17_exec-root: 46.40 :small_red_triangle_up: ( previous job: 40.43, degradation: 114.76%)
• whonix-gateway-17_socket: 7.98 :small_red_triangle_up: ( previous job: 7.24, degradation: 110.33%)
• dom0_root_seq1m_q8t1_read 3:read_bandwidth_kb: 225694.00 :small_red_triangle_up: ( previous job: 446963.00, degradation: 50.50%)
• dom0_root_seq1m_q1t1_read 3:read_bandwidth_kb: 134321.00 :small_red_triangle_up: ( previous job: 294295.00, degradation: 45.64%)
• dom0_root_seq1m_q1t1_write 3:write_bandwidth_kb: 68030.00 :small_red_triangle_up: ( previous job: 95454.00, degradation: 71.27%)
• dom0_varlibqubes_rnd4k_q1t1_write 3:write_bandwidth_kb: 2745.00 :small_red_triangle_up: ( previous job: 4903.00, degradation: 55.99%)
• fedora-41-xfce_root_rnd4k_q32t1_write 3:write_bandwidth_kb: 1948.00 :small_red_triangle_up: ( previous job: 3599.00, degradation: 54.13%)
• fedora-41-xfce_root_rnd4k_q1t1_read 3:read_bandwidth_kb: 6831.00 :small_red_triangle_up: ( previous job: 8485.00, degradation: 80.51%)
• fedora-41-xfce_volatile_rnd4k_q32t1_read 3:read_bandwidth_kb: 65941.00 :small_red_triangle_up: ( previous job: 79021.00, degradation: 83.45%)
• fedora-41-xfce_volatile_rnd4k_q32t1_write 3:write_bandwidth_kb: 3849.00 :small_red_triangle_up: ( previous job: 5672.00, degradation: 67.86%)
• fedora-41-xfce_volatile_rnd4k_q1t1_read 3:read_bandwidth_kb: 6793.00 :small_red_triangle_up: ( previous job: 7867.00, degradation: 86.35%)
• fedora-41-xfce_volatile_rnd4k_q1t1_write 3:write_bandwidth_kb: 1078.00 :small_red_triangle_up: ( previous job: 1953.00, degradation: 55.20%)

Remaining performance tests:

58 tests

• debian-12-xfce_exec-root: 29.20 :small_red_triangle_up: ( previous job: 28.65, degradation: 101.89%)
• debian-12-xfce_socket: 8.87 :small_red_triangle_up: ( previous job: 8.60, degradation: 103.13%)
• debian-12-xfce_socket-root: 8.18 🟢 ( previous job: 8.52, improvement: 95.96%)
• debian-12-xfce_exec-data-simplex: 61.04 🟢 ( previous job: 71.62, improvement: 85.23%)
• debian-12-xfce_exec-data-duplex: 72.15 :small_red_triangle_up: ( previous job: 70.34, degradation: 102.57%)
• debian-12-xfce_socket-data-duplex: 157.92 :small_red_triangle_up: ( previous job: 156.96, degradation: 100.61%)
• fedora-41-xfce_exec: 9.20 🟢 ( previous job: 9.27, improvement: 99.30%)
• fedora-41-xfce_exec-root: 62.14 :small_red_triangle_up: ( previous job: 61.51, degradation: 101.03%)
• fedora-41-xfce_socket: 8.61 🟢 ( previous job: 8.63, improvement: 99.76%)
• fedora-41-xfce_socket-root: 9.03 :small_red_triangle_up: ( previous job: 8.71, degradation: 103.74%)
• fedora-41-xfce_exec-data-simplex: 69.28 🟢 ( previous job: 75.53, improvement: 91.71%)
• fedora-41-xfce_exec-data-duplex: 73.35 :small_red_triangle_up: ( previous job: 71.56, degradation: 102.50%)
• fedora-41-xfce_exec-data-duplex-root: 93.44 🟢 ( previous job: 109.13, improvement: 85.63%)
• fedora-41-xfce_socket-data-duplex: 163.31 :small_red_triangle_up: ( previous job: 150.61, degradation: 108.43%)
• whonix-gateway-17_exec: 7.21 :small_red_triangle_up: ( previous job: 6.82, degradation: 105.78%)
• whonix-gateway-17_socket-root: 8.14 :small_red_triangle_up: ( previous job: 7.65, degradation: 106.35%)
• whonix-gateway-17_exec-data-simplex: 74.28 🟢 ( previous job: 78.32, improvement: 94.85%)
• whonix-gateway-17_exec-data-duplex: 69.45 🟢 ( previous job: 76.65, improvement: 90.60%)
• whonix-gateway-17_exec-data-duplex-root: 96.26 :small_red_triangle_up: ( previous job: 88.52, degradation: 108.74%)
• whonix-gateway-17_socket-data-duplex: 163.33 🟢 ( previous job: 171.76, improvement: 95.09%)
• whonix-workstation-17_exec: 7.87 :small_red_triangle_up: ( previous job: 7.67, degradation: 102.65%)
• whonix-workstation-17_exec-root: 53.69 🟢 ( previous job: 58.26, improvement: 92.15%)
• whonix-workstation-17_socket: 8.53 :small_red_triangle_up: ( previous job: 8.19, degradation: 104.13%)
• whonix-workstation-17_socket-root: 8.31 :small_red_triangle_up: ( previous job: 8.13, degradation: 102.22%)
• whonix-workstation-17_exec-data-simplex: 78.11 :small_red_triangle_up: ( previous job: 74.99, degradation: 104.16%)
• whonix-workstation-17_exec-data-duplex: 73.07 :small_red_triangle_up: ( previous job: 72.71, degradation: 100.50%)
• whonix-workstation-17_exec-data-duplex-root: 104.61 :small_red_triangle_up: ( previous job: 99.82, degradation: 104.80%)
• whonix-workstation-17_socket-data-duplex: 165.89 🟢 ( previous job: 169.50, improvement: 97.87%)
• dom0_root_seq1m_q8t1_write 3:write_bandwidth_kb: 185281.00 :green_circle: ( previous job: 129298.00, improvement: 143.30%)
• dom0_root_rnd4k_q32t1_read 3:read_bandwidth_kb: 103933.00 :green_circle: ( previous job: 79803.00, improvement: 130.24%)
• dom0_root_rnd4k_q32t1_write 3:write_bandwidth_kb: 6963.00 :green_circle: ( previous job: 6149.00, improvement: 113.24%)
• dom0_root_rnd4k_q1t1_read 3:read_bandwidth_kb: 11775.00 :green_circle: ( previous job: 10795.00, improvement: 109.08%)
• dom0_root_rnd4k_q1t1_write 3:write_bandwidth_kb: 5257.00 :green_circle: ( previous job: 4826.00, improvement: 108.93%)
• dom0_varlibqubes_seq1m_q8t1_read 3:read_bandwidth_kb: 446582.00 :green_circle: ( previous job: 382273.00, improvement: 116.82%)
• dom0_varlibqubes_seq1m_q8t1_write 3:write_bandwidth_kb: 231780.00 :small_red_triangle_up: ( previous job: 250795.00, degradation: 92.42%)
• dom0_varlibqubes_seq1m_q1t1_read 3:read_bandwidth_kb: 431335.00 :small_red_triangle_up: ( previous job: 437636.00, degradation: 98.56%)
• dom0_varlibqubes_seq1m_q1t1_write 3:write_bandwidth_kb: 173358.00 :small_red_triangle_up: ( previous job: 184752.00, degradation: 93.83%)
• dom0_varlibqubes_rnd4k_q32t1_read 3:read_bandwidth_kb: 105654.00 :green_circle: ( previous job: 62195.00, improvement: 169.88%)
• dom0_varlibqubes_rnd4k_q32t1_write 3:write_bandwidth_kb: 8805.00 :green_circle: ( previous job: 6479.00, improvement: 135.90%)
• dom0_varlibqubes_rnd4k_q1t1_read 3:read_bandwidth_kb: 7477.00 :small_red_triangle_up: ( previous job: 7669.00, degradation: 97.50%)
• fedora-41-xfce_root_seq1m_q8t1_read 3:read_bandwidth_kb: 367019.00 :small_red_triangle_up: ( previous job: 368309.00, degradation: 99.65%)
• fedora-41-xfce_root_seq1m_q8t1_write 3:write_bandwidth_kb: 283398.00 :green_circle: ( previous job: 162081.00, improvement: 174.85%)
• fedora-41-xfce_root_seq1m_q1t1_read 3:read_bandwidth_kb: 290867.00 :small_red_triangle_up: ( previous job: 318716.00, degradation: 91.26%)
• fedora-41-xfce_root_seq1m_q1t1_write 3:write_bandwidth_kb: 128025.00 :green_circle: ( previous job: 87940.00, improvement: 145.58%)
• fedora-41-xfce_root_rnd4k_q32t1_read 3:read_bandwidth_kb: 87239.00 :green_circle: ( previous job: 82694.00, improvement: 105.50%)
• fedora-41-xfce_root_rnd4k_q1t1_write 3:write_bandwidth_kb: 1327.00 :green_circle: ( previous job: 542.00, improvement: 244.83%)
• fedora-41-xfce_private_seq1m_q8t1_read 3:read_bandwidth_kb: 399305.00 :green_circle: ( previous job: 373957.00, improvement: 106.78%)
• fedora-41-xfce_private_seq1m_q8t1_write 3:write_bandwidth_kb: 265596.00 :green_circle: ( previous job: 170062.00, improvement: 156.18%)
• fedora-41-xfce_private_seq1m_q1t1_read 3:read_bandwidth_kb: 304199.00 :small_red_triangle_up: ( previous job: 334687.00, degradation: 90.89%)
• fedora-41-xfce_private_seq1m_q1t1_write 3:write_bandwidth_kb: 74617.00 :green_circle: ( previous job: 61534.00, improvement: 121.26%)
• fedora-41-xfce_private_rnd4k_q32t1_read 3:read_bandwidth_kb: 89694.00 :green_circle: ( previous job: 80283.00, improvement: 111.72%)
• fedora-41-xfce_private_rnd4k_q32t1_write 3:write_bandwidth_kb: 3753.00 :green_circle: ( previous job: 2215.00, improvement: 169.44%)
• fedora-41-xfce_private_rnd4k_q1t1_read 3:read_bandwidth_kb: 7386.00 :small_red_triangle_up: ( previous job: 7540.00, degradation: 97.96%)
• fedora-41-xfce_private_rnd4k_q1t1_write 3:write_bandwidth_kb: 1295.00 :green_circle: ( previous job: 1130.00, improvement: 114.60%)
• fedora-41-xfce_volatile_seq1m_q8t1_read 3:read_bandwidth_kb: 343345.00 :small_red_triangle_up: ( previous job: 369868.00, degradation: 92.83%)
• fedora-41-xfce_volatile_seq1m_q8t1_write 3:write_bandwidth_kb: 164476.00 :small_red_triangle_up: ( previous job: 179949.00, degradation: 91.40%)
• fedora-41-xfce_volatile_seq1m_q1t1_read 3:read_bandwidth_kb: 342896.00 :green_circle: ( previous job: 324737.00, improvement: 105.59%)
• fedora-41-xfce_volatile_seq1m_q1t1_write 3:write_bandwidth_kb: 45197.00 :green_circle: ( previous job: 17567.00, improvement: 257.28%)