Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #38017 - fog-libvirt 0.13.1 & tests #10377

Merged
merged 1 commit into from
Nov 21, 2024

Conversation

stejskalleos
Copy link
Contributor

@stejskalleos stejskalleos commented Nov 18, 2024

No description provided.

@stejskalleos
Copy link
Contributor Author

git bisect

801ce47ed9fe1295f2753eafabdf4e97021767f7 is the first bad commit
commit 801ce47ed9fe1295f2753eafabdf4e97021767f7
Author: Ewoud Kohl van Wijngaarden <[email protected]>
Date:   Thu Jun 13 15:57:28 2024 +0200

    Use test:///default in tests
    
    Rather than mocking, this uses the test connection to use real libvirt
    objects. This brings compatibility with 0.8.3.
    
    It only keeps mocking for dhcp_leases which isn't implemented in the
    test connection. The UUIDs are modified to match.

Some of these changes causing the failures, looking into it.

@ekohl
Copy link
Member

ekohl commented Nov 18, 2024

Perhaps I broke something with Fog.mock! when changing lib/fog/libvirt/compute.rb. In fog/fog-libvirt@801ce47#diff-aea1b857f83e8b2aa12130a08e1d1f3ce51b5665b0e44024dd2213c9ee555634 I made mock and real the same.

We have this line that could cause an issue:

url: qemu://stam/system

I have no idea if we actually need that. In general I'm not a fan of fixtures in tests.

@stejskalleos stejskalleos changed the title [WIP] Failing Libvirt tests Fixes #38017 - Update libvirt gems & fix tests Nov 19, 2024
@stejskalleos stejskalleos marked this pull request as ready for review November 19, 2024 07:02
@stejskalleos stejskalleos requested a review from a team as a code owner November 19, 2024 07:02
@stejskalleos stejskalleos force-pushed the ls/libvirt_u24 branch 2 times, most recently from a9d69c5 to 6656b34 Compare November 19, 2024 07:48
@stejskalleos stejskalleos requested a review from ekohl November 19, 2024 08:09
@stejskalleos
Copy link
Contributor Author

@ekohl aaand it's 🍏 !

bundler.d/libvirt.rb Outdated Show resolved Hide resolved
bundler.d/libvirt.rb Outdated Show resolved Hide resolved
ekohl
ekohl previously requested changes Nov 20, 2024
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test changes look good, just needs to update the bundler file to not point to my fork anymore :)

bundler.d/libvirt.rb Outdated Show resolved Hide resolved
@stejskalleos stejskalleos changed the title Fixes #38017 - Update libvirt gems & fix tests Fixes #38017 - fog-libvirt 0.13.1 & tests Nov 21, 2024
gem 'fog-libvirt', '>= 0.12.0'
gem 'fog-libvirt', '>= 0.13.1'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

technically, this bump is unnecessary, as Foreman itself will work just fine with both 0.12.0 and 0.13.0, it's just the tests that are broken with those versions (0.12.0 because we now rely on the new mocked values from 0.13.0, 0.13.0 because it broke the URL thing).

keeping it at 0.12.0 allows packaging to lazily catch up on this, instead of having to have 0.13.1 go in at the same time as this change to not block nightlies.

(once again: not blocking, but a strong preference ;-) )

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, updated.

@evgeni evgeni dismissed ekohl’s stale review November 21, 2024 07:49

changes were adressed

@evgeni evgeni merged commit d39c419 into theforeman:develop Nov 21, 2024
52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants