Avoid reusing disposable VM names for some predefined time

[alimirjamali]

Fixes: QubesOS/qubes-issues#8512

[rustybird]

Why not time.monotonic()?

[alimirjamali]

Why not time.monotonic()?

Oh. Forgot that. We had discussed datetime module. When I switched to time module (since it was already used in the code), I forgot to re-implement monotonic. I will amend the code and force push in a second.

[alimirjamali]

Making Pylint happy

[codecov]

Codecov Report

Attention: Patch coverage is 90.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 69.36%. Comparing base (3362ffc) to head (dc4b63c).

Files	Patch %	Lines
qubes/app.py	90.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #603      +/-   ##
==========================================
+ Coverage   69.35%   69.36%   +0.01%     
==========================================
  Files          58       58              
  Lines       11919    11929      +10     
==========================================
+ Hits         8266     8275       +9     
- Misses       3653     3654       +1     

Flag	Coverage Δ
unittests	69.36% <90.00%> (+0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

[marmarek]

The change itself looks good, but can you add a unit test? Tests for VMCollection are in qubes/tests/app.py. And you can mock the random.SystemRandom() with something like

with unittest.mock.patch('random.SystemRandom') as random:
    # randrange will return 33, then 44, then 55
    random.return_value.randrange.side_effect = [33, 44, 55]
...

[alimirjamali]

The change itself looks good, but can you add a unit test?

Sure. Will work on it.

[alimirjamali]

but can you add a unit test?

I added the Unit Test in the second commit @marmarek .

Unit test number 999999 is inspired by the Dilbert comic strip URL which was added to the original function by fepitre.

[alimirjamali]

Ok. Test completed successfully.

Here is the link: https://gitlab.com/QubesOS/qubes-core-admin/-/jobs/7250348262#L3221

[qubesos-bot]

OpenQA test summary

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

Test run included the following:

• Fix plymouth on multi-screens with different resolution qubes-artwork#41 (QubesOS/qubes-artwork@2148dce)
• api/admin: gracefully handle device listing during qubesd shutdown #609 (1734b65)
• Qubes outline logo for Plymouth shutdown splash qubes-artwork#40 (QubesOS/qubes-artwork@67fc3ef)
• qubes-dom0-update: prevent concurrent execution qubes-core-admin-linux#161 (QubesOS/qubes-core-admin-linux@18fd950)
• Avoid reusing disposable VM names for some predefined time #603 (dc4b63c)
• Improve Qubes OS Update reporting for dom0 qubes-desktop-linux-manager#213 (QubesOS/qubes-desktop-linux-manager@84366b4)
• Support additional policy directories qubes-core-qrexec#134 (QubesOS/qubes-core-qrexec@966e383)
• Minimize package manager calls qubes-mgmt-salt-dom0-virtual-machines#64 (QubesOS/qubes-mgmt-salt-dom0-virtual-machines@f13b9f6)
• tests/integ/audio.py: add test for audio-intput in QubesDB #608 (d80114a)
• tests: increase memory size for webcam viewing VM qubes-video-companion#28 (QubesOS/qubes-video-companion@9c4e8bf)
• Remove deprecated pkg-resources, replace with packaging qubes-core-admin-linux#152 (QubesOS/qubes-core-admin-linux@38cab01)
• Use QubesDB for knowing if mic is allowed or not qubes-gui-daemon#145 (QubesOS/qubes-gui-daemon@844ce83)

New failures, excluding unstable

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

• system_tests_audio

  • TC_20_AudioVM_PipeWire_debian-12-xfce: test_260_audio_mic_enabled_switch_audiovm (failure)
    AssertionError: too short audio, expected 10s, got 0.00013605442176...

• system_tests_basic_vm_qrexec_gui_zfs

  • TC_00_Basic: test_120_start_standalone_with_cdrom_dom0 (failure)
    AssertionError: 1 != 0 : b'Timeout waiting for dom0:loop6 device to...

Failed tests

9 failures

• system_tests_pvgrub_salt_storage

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

  • [unstable] TC_41_HVMGrub_debian-12-xfce: test_010_template_based_vm (error)
    qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

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

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

• system_tests_extra

  • [unstable] TC_00_QVCTest_debian-12-xfce: test_020_webcam (failure)
    AssertionError: 1 != 0 : Timeout waiting for /dev/video0 in test-in...

  • [unstable] TC_00_QVCTest_fedora-40-xfce: test_020_webcam (failure)
    AssertionError: 1 != 0 : Timeout waiting for /dev/video0 in test-in...

  • [unstable] TC_00_QVCTest_whonix-workstation-17: test_020_webcam (failure)
    AssertionError: 1 != 0 : Timeout waiting for /dev/video0 in test-in...

• system_tests_audio

  • TC_20_AudioVM_PipeWire_debian-12-xfce: test_260_audio_mic_enabled_switch_audiovm (failure)
    AssertionError: too short audio, expected 10s, got 0.00013605442176...

• system_tests_basic_vm_qrexec_gui_zfs

  • TC_00_Basic: test_120_start_standalone_with_cdrom_dom0 (failure)
    AssertionError: 1 != 0 : b'Timeout waiting for dom0:loop6 device to...

Fixed failures

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

5 fixed

• system_tests_splitgpg

  • TC_10_Thunderbird_debian-12-xfce: test_010_send_receive_inline_signed_only (failure)
    dogtail.tree.SearchError: descendent of [application | Thunderbird]...

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

• system_tests_extra

  • TC_00_QVCTest_whonix-gateway-17: test_020_webcam (failure + cleanup)
    AssertionError: 'qubes-video-companion webcam' exited early (0): b'...

• system_tests_usbproxy

  • TC_20_USBProxy_core3_fedora-40-xfce: test_070_attach_not_installed_front (error)
    qubesusbproxy.core3ext.QubesUSBException: Device attach failed: 202...

• system_tests_network_updates

  • TC_11_QvmTemplateMgmtVM_debian-12-xfce: test_000_template_list (failure)
    AssertionError: libvirt event impl drain timeout

Unstable tests

• system_tests_update

  update2/Failed (1/5 times with errors)

  • job 103358 # Test died: command 'script -c 'qubes-vm-update --max-concurrency=...

• system_tests_suspend

  suspend/ (1/5 times with errors)

  • job 103660 None
  suspend/Failed (1/5 times with errors)

  • job 103660 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 103660 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_basic_vm_qrexec_gui

  TC_20_AudioVM_Pulse_whonix-workstation-17/test_220_audio_play_pulseaudio (1/5 times with errors)

  • job 103642 AssertionError: too short audio, expected 10s, got 8.64043083900226...
  TC_20_AudioVM_Pulse_whonix-workstation-17/test_221_audio_rec_muted_pulseaudio (1/5 times with errors)

  • job 103642 Cannot process volume group qubes_dom0...
  TC_20_AudioVM_Pulse_whonix-workstation-17/test_223_audio_play_hvm (1/5 times with errors)

  • job 102413 AssertionError: only silence detected, no useful audio data

• system_tests_pvgrub_salt_storage

  TC_41_HVMGrub_debian-12-xfce/test_000_standalone_vm (1/5 times with errors)

  • job 102428 qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...
  TC_41_HVMGrub_debian-12-xfce/test_010_template_based_vm (1/5 times with errors)

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

• system_tests_splitgpg

  TC_10_Thunderbird_debian-12-xfce/test_010_send_receive_inline_signed_only (1/5 times with errors)

  • job 105472 dogtail.tree.SearchError: descendent of [application | Thunderbird]...

• system_tests_extra

  TC_00_QVCTest_debian-12-xfce/test_020_webcam (2/5 times with errors)

  • job 102420 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  • job 104728 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  TC_00_QVCTest_fedora-40-xfce/test_020_webcam (2/5 times with errors)

  • job 105464 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  • job 105868 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  TC_00_QVCTest_whonix-gateway-17/test_020_webcam (4/5 times with errors)

  • job 102420 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  • job 103649 self.assertNotEqual(vm.run('test -e /dev/vid... AssertionError: 0 == 0
  • job 105464 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  • job 105868 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  TC_00_QVCTest_whonix-workstation-17/test_020_webcam (4/5 times with errors)

  • job 102420 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  • job 103649 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  • job 105464 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...
  • job 105868 AssertionError: 'qubes-video-companion webcam' exited early (0): b'...

• system_tests_usbproxy

  TC_20_USBProxy_core3_fedora-40-xfce/test_070_attach_not_installed_front (1/5 times with errors)

  • job 105442 qubesusbproxy.core3ext.QubesUSBException: Device attach failed: 202...

• system_tests_network_updates

  TC_11_QvmTemplateMgmtVM_debian-12-xfce/test_000_template_list (1/5 times with errors)

  • job 105469 AssertionError: libvirt event impl drain timeout
  TC_10_QvmTemplate_whonix-gateway-17/test_010_template_install (2/5 times with errors)

  • job 103656 AssertionError: libvirt event impl drain timeout
  • job 105873 AssertionError: libvirt event impl drain timeout
  VmUpdates_debian-12-xfce/test_020_updates_available_notification (1/5 times with errors)

  • job 104735 subprocess.CalledProcessError: Command '/usr/lib/qubes/upgrades-sta...
  VmUpdates_debian-12-xfce/test_110_update_via_proxy_qubes_vm_update (1/5 times with errors)

  • job 104735 AssertionError: 1 not found in [0] : dpkg -l test-pkg | grep 1.1: b''
  VmUpdates_fedora-40-xfce/test_110_update_via_proxy_qubes_vm_update (1/5 times with errors)

  • job 104735 AssertionError: 1 not found in [0, 100] : rpm -q test-pkg | grep 1....
  VmUpdates_debian-12-xfce/test_111_update_via_proxy_qubes_vm_update_cli (1/5 times with errors)

  • job 104735 AssertionError: 1 not found in [0] : dpkg -l test-pkg | grep 1.1: b''
  VmUpdates_fedora-40-xfce/test_111_update_via_proxy_qubes_vm_update_cli (1/5 times with errors)

  • job 104735 AssertionError: 1 not found in [0, 100] : rpm -q test-pkg | grep 1....
  VmUpdates_debian-12-xfce/test_130_no_network_qubes_vm_update (1/5 times with errors)

  • job 104735 AssertionError: qubes-vm-update return unexpected code: 0 in (1, 2, 5)
  VmUpdates_fedora-40-xfce/test_130_no_network_qubes_vm_update (1/5 times with errors)

  • job 104735 AssertionError: qubes-vm-update return unexpected code: 0 in (1, 2, 5)
  VmUpdates_debian-12-xfce/test_131_no_network_qubes_vm_update_cli (1/5 times with errors)

  • job 104735 AssertionError: qubes-vm-update return unexpected code: 0 in (1, 2, 5)
  VmUpdates_fedora-40-xfce/test_131_no_network_qubes_vm_update_cli (1/5 times with errors)

  • job 104735 AssertionError: qubes-vm-update return unexpected code: 0 in (1, 2, 5)

• system_tests_dispvm

  TC_20_DispVM_fedora-40-xfce/test_100_open_in_dispvm (1/5 times with errors)

  • job 102419 AssertionError: './open-file test.txt' failed with ./open-file test...

• system_tests_update@hw1

  update2/Failed (1/5 times with errors)

  • job 103358 # Test died: command 'script -c 'qubes-vm-update --max-concurrency=...

• system_tests_update@hw7

  update2/Failed (1/5 times with errors)

  • job 103358 # Test died: command 'script -c 'qubes-vm-update --max-concurrency=...

• system_tests_basic_vm_qrexec_gui_ext4

  TC_20_AudioVM_Pulse_debian-12-xfce-pool/test_223_audio_play_hvm (1/5 times with errors)

  • job 102415 AssertionError: only silence detected, no useful audio data

• system_tests_basic_vm_qrexec_gui_xfs

  TC_20_AudioVM_PipeWire_debian-12-xfce-pool/test_226_audio_playback_pipewire (1/5 times with errors)

  • job 102416 AssertionError: too short audio, expected 10s, got 8.31034013605442...
  TC_20_AudioVM_PipeWire_debian-12-xfce-pool/test_228_audio_rec_unmuted_pipewire (1/5 times with errors)

  • job 102416 AssertionError: too short audio, expected 10s, got 8.89784580498866...
  TC_20_AudioVM_PipeWire_fedora-40-xfce-pool/test_228_audio_rec_unmuted_pipewire (1/5 times with errors)

  • job 102416 AssertionError: too short audio, expected 10s, got 9.45630385487528...
  TC_20_AudioVM_PipeWire_debian-12-xfce-pool/test_250_audio_playback_audiovm_pipewire (1/5 times with errors)

  • job 102416 AssertionError: too short audio, expected 10s, got 7.48553287981859...
  TC_20_AudioVM_PipeWire_debian-12-xfce-pool/test_251_audio_playback_audiovm_pipewire_late_start (1/5 times with errors)

  • job 102416 AssertionError: too short audio, expected 10s, got 9.19612244897959...
  TC_20_AudioVM_Pulse_whonix-workstation-17-pool/test_252_audio_playback_audiovm_switch_hvm (1/5 times with errors)

  • job 102416 AssertionError: too short audio, expected 10s, got 6.77941043083900...

• system_tests_basic_vm_qrexec_gui@hw1

  TC_20_AudioVM_Pulse_whonix-workstation-17/test_220_audio_play_pulseaudio (1/5 times with errors)

  • job 103642 AssertionError: too short audio, expected 10s, got 8.64043083900226...
  TC_20_AudioVM_Pulse_whonix-workstation-17/test_221_audio_rec_muted_pulseaudio (1/5 times with errors)

  • job 103642 Cannot process volume group qubes_dom0...
  TC_20_AudioVM_Pulse_whonix-workstation-17/test_223_audio_play_hvm (1/5 times with errors)

  • job 102413 AssertionError: only silence detected, no useful audio data

• system_tests_suspend@hw1

  suspend/ (1/5 times with errors)

  • job 103660 None
  suspend/Failed (1/5 times with errors)

  • job 103660 # Test died: no candidate needle with tag(s) 'xscreensaver-prompt' ...
  suspend/wait_serial (1/5 times with errors)

  • job 103660 # wait_serial expected: qr/2E8vz-\d+-/...

• system_tests_basic_vm_qrexec_gui_zfs

  TC_20_AudioVM_Pulse_debian-12-xfce-pool/test_223_audio_play_hvm (1/5 times with errors)

  • job 103646 AssertionError: only silence detected, no useful audio data