restore: add hyphen before number suffix for conflicting name

[rustybird]

See commit message

[codecov]

Codecov Report

❌ Patch coverage is 0% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 75.99%. Comparing base (a27a48d) to head (369fec4).
⚠️ Report is 5 commits behind head on main.

Files with missing lines	Patch %	Lines
qubesadmin/backup/restore.py	0.00%	1 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #410   +/-   ##
=======================================
  Coverage   75.99%   75.99%           
=======================================
  Files          53       53           
  Lines        9264     9264           
=======================================
  Hits         7040     7040           
  Misses       2224     2224           

☔ 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.

[marmarek]

I'm pretty sure backup tests in https://github.com/QubesOS/qubes-core-admin/tree/main/qubes/tests/integ will need adjustment too. I see it at least at https://github.com/QubesOS/qubes-core-admin/blob/main/qubes/tests/integ/backup.py#L641, but probably in few other tests too.

[qubesos-bot]

OpenQA test summary

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

Test run included the following:

• Add option to wait for GUI session qubes-app-linux-input-proxy#42 (QubesOS/qubes-app-linux-input-proxy@cd6d205)
• Clean up list options before passing them to GnuPG qubes-app-linux-split-gpg#111 (QubesOS/qubes-app-linux-split-gpg@6d97051)
• Add Arch packaging #332 (40487bc)
• restore: add hyphen before number suffix for conflicting name #410 (369fec4)
• tests: log more info on failure qubes-core-admin#736 (QubesOS/qubes-core-admin@a3fc21c)
• Wait for user session for preloaded disposables qubes-core-admin#757 (QubesOS/qubes-core-admin@9ecad91)
• Skip unecessary event qubes-core-admin#778 (QubesOS/qubes-core-admin@4bb6e66)
• tests: adjust for hyphen in restored VM name qubes-core-admin#780 (QubesOS/qubes-core-admin@e1ccad2)
• Allow GUIVM clients to know if GUIVM has session qubes-core-agent-linux#625 (QubesOS/qubes-core-agent-linux@e7db241)
• Query GUIVM session or GUID from client in GUIVM qubes-core-qrexec#217 (QubesOS/qubes-core-qrexec@5dc1b28)
• Update to upstream version 4.25.1 qubes-desktop-linux-i3#55 (QubesOS/qubes-desktop-linux-i3@db3d31a)
• Make icons bluer qubes-desktop-linux-manager#289 (QubesOS/qubes-desktop-linux-manager@de2020d)
• Attach to new disposable: omit template on deletion, not shutdown qubes-desktop-linux-manager#293 (QubesOS/qubes-desktop-linux-manager@d1d371d)
• Delay connecting with gui-daemon until after starting Xorg qubes-gui-agent-linux#251 (QubesOS/qubes-gui-agent-linux@a981e36)
• Don't hang is-system-running when GUI is disabled qubes-gui-agent-linux#255 (QubesOS/qubes-gui-agent-linux@9129d1c)
• Update to 1.3.3 qubes-linux-scrypt#12 (QubesOS/qubes-linux-scrypt@b7f2734)
• Make icons blue qubes-manager#441 (QubesOS/qubes-manager@a5d8091)
• Allow GUIVM clients to know if GUIVM has session qubes-mgmt-salt-dom0-virtual-machines#88 (QubesOS/qubes-mgmt-salt-dom0-virtual-machines@4c3007f)
• Wait for GUI session on the server side qubes-notification-proxy#14 (QubesOS/qubes-notification-proxy@6da96ee)
• Enforce system python in RPC calls qubes-video-companion#37 (QubesOS/qubes-video-companion@a9e61ba)

New failures, excluding unstable

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

• system_tests_network

  • VmNetworking_fedora-42-xfce: test_001_simple_networking_paused_from_none_to_existent (error)
    subprocess.CalledProcessError: Command 'qubes.WaitForNetworkUplink'...

• system_tests_guivm_gui_interactive

  • collect_logs: wait_serial (wait serial expected)
    # wait_serial expected: qr/JrqaX-\d+-/...

  • collect_logs: Failed (test died + timed out)
    # Test died: command 'curl --form [email protected] --form upn...

  • collect_logs: wait_serial (wait serial expected)
    # wait_serial expected: qr/lqE1a-\d+-/...

• system_tests_basic_vm_qrexec_gui_xfs

  • TC_20_NonAudio_whonix-gateway-18-pool: test_000_start_shutdown (error)
    subprocess.CalledProcessError: Command 'qubes.WaitForSession' retur...

• system_tests_gui_tools

  • qubesmanager_manager: unnamed test (unknown)
  • qubesmanager_manager: Failed (test died)
    # Test died: no candidate needle with tag(s) 'qube-manager-dom0-log...

Failed tests

7 failures

• system_tests_network

  • VmNetworking_fedora-42-xfce: test_001_simple_networking_paused_from_none_to_existent (error)
    subprocess.CalledProcessError: Command 'qubes.WaitForNetworkUplink'...

• system_tests_guivm_gui_interactive

  • collect_logs: wait_serial (wait serial expected)
    # wait_serial expected: qr/JrqaX-\d+-/...

  • collect_logs: Failed (test died + timed out)
    # Test died: command 'curl --form [email protected] --form upn...

  • collect_logs: wait_serial (wait serial expected)
    # wait_serial expected: qr/lqE1a-\d+-/...

• system_tests_basic_vm_qrexec_gui_xfs

  • TC_20_NonAudio_whonix-gateway-18-pool: test_000_start_shutdown (error)
    subprocess.CalledProcessError: Command 'qubes.WaitForSession' retur...

• system_tests_gui_tools

  • qubesmanager_manager: unnamed test (unknown)
  • qubesmanager_manager: Failed (test died)
    # Test died: no candidate needle with tag(s) 'qube-manager-dom0-log...

Fixed failures

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

31 fixed

• system_tests_network

  • VmNetworking_debian-13-xfce: test_001_simple_networking_paused_from_existent_to_none (error)
    qubes.exc.QubesVMError: netvm should not be None

  • VmNetworking_debian-13-xfce: test_110_dynamic_attach (failure)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError: 125 != 0

  • VmNetworking_fedora-42-xfce: test_001_simple_networking_paused_from_existent_to_none (error)
    qubes.exc.QubesVMError: netvm should not be None

  • VmNetworking_fedora-42-xfce: test_110_dynamic_attach (failure)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError: 125 != 0

• system_tests_pvgrub_salt_storage

  • system_tests: Fail (unknown)
    Tests qubes.tests.integ.grub failed (exit code 1), details reported...

  • system_tests: Failed (test died)
    # Test died: Some tests failed at qubesos/tests/system_tests.pm lin...

  • TC_41_HVMGrub_fedora-42-xfce: test_000_standalone_vm (error)
    qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

  • TC_41_HVMGrub_fedora-42-xfce: test_010_template_based_vm (error)
    qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

• system_tests_gui_interactive

  • collect_logs: wait_serial (wait serial expected)
    # wait_serial expected: qr/m~uU4-\d+-/...

  • collect_logs: Failed (test died + timed out)
    # Test died: command 'curl --form [email protected] --form upn...

• system_tests_network_ipv6

  • system_tests: Fail (unknown)
    Tests qubes.tests.integ.network_ipv6 failed (exit code 1), details ...

  • system_tests: Failed (test died)
    # Test died: Some tests failed at qubesos/tests/system_tests.pm lin...

  • VmIPv6Networking_debian-13-xfce: test_001_simple_networking_paused_from_existent_to_none (error)
    qubes.exc.QubesVMError: netvm should not be None

  • VmIPv6Networking_debian-13-xfce: test_501_simple_networking_paused_from_existent_to_none (error)
    qubes.exc.QubesVMError: netvm should not be None

  • VmIPv6Networking_fedora-42-xfce: test_001_simple_networking_paused_from_existent_to_none (error)
    qubes.exc.QubesVMError: netvm should not be None

  • VmIPv6Networking_fedora-42-xfce: test_501_simple_networking_paused_from_existent_to_none (error)
    qubes.exc.QubesVMError: netvm should not be None

• system_tests_network_updates

  • system_tests: Fail (unknown)
    Tests qubes.tests.integ.dom0_update failed (exit code 1), details r...

  • system_tests: Failed (test died)
    # Test died: Some tests failed at qubesos/tests/system_tests.pm lin...

  • TC_00_Dom0Upgrade_whonix-gateway-18: test_000_update_salt (failure)
    ?[0;31mDuration: 139139.863 ms?[0;0m... ?[0;31m Changes: ?[0;0m

• system_tests_dispvm

  • system_tests: Fail (unknown)
    Tests qubes.tests.integ.dispvm failed (exit code 1), details report...

  • system_tests: Failed (test died)
    # Test died: Some tests failed at qubesos/tests/system_tests.pm lin...

  • TC_20_DispVM_whonix-workstation-18: test_015_preload_race_more (error)
    raise TimeoutError from exc_val... TimeoutError

• system_tests_guivm_vnc_gui_interactive

  • guivm_manager: unnamed test (unknown)

  • guivm_manager: Failed (test died)
    # Test died: no candidate needle with tag(s) 'menu-qubes-tools' mat...

  • guivm_manager: wait_serial (wait serial expected)
    # wait_serial expected: qr/yp0HG-\d+-/...

• system_tests_audio

  • system_tests: Fail (unknown)
    Tests qubes.tests.integ.audio failed (exit code 1), details reporte...

  • system_tests: Failed (test died)
    # Test died: Some tests failed at qubesos/tests/system_tests.pm lin...

  • TC_20_AudioVM_PipeWire_whonix-workstation-18: test_260_audio_mic_enabled_switch_audiovm (failure)
    AssertionError: Failed to get mic attach/detach status!

• system_tests_whonix

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

  • whonixcheck: wait_serial (wait serial expected)
    # wait_serial expected: qr/D8rIe-\d+-/...

  • whonixcheck: Failed (test died + timed out)
    # Test died: command 'qvm-run -ap whonix-gateway-18 'LC_ALL=C whon...

Unstable tests

Details

Performance Tests

Performance degradation:

No issues

Remaining performance tests:

No remaining performance tests

[rustybird]

@marmarek

Thanks, looks like it's just that one integration test. I'll adjust it.

Come to think of it, how about starting the numerical suffix from 2 instead of 1? IMO that would make more sense. (Or something like vmname-restore-1 - but that seems maybe a little bit too long.)

[marmarek]

Come to think of it, how about starting the numerical suffix from 2 instead of 1?

Usually file managers in similar situation (file name conflicts) start the number suffix at 1.

[rustybird]

Nautilus adds (2), and Thunar adds (copy 1). Both look fine to me because "the 2nd foo" is the "the 1st copy of foo". OTOH Firefox and Chromium really do just add (1) without any copy marker string for automatic downloads. I guess it's not that weird.