Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2025-06-03 17:50:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.16005 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Tue Jun 3 17:50:26 2025 rev:174 rq:1281960 version:3006.0 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2025-05-23 14:29:26.733774615 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new.16005/salt.changes 2025-06-03 17:50:41.042500016 +0200 @@ -1,0 +2,8 @@ +Tue May 27 08:26:18 UTC 2025 - Marek Czernek <marek.czer...@suse.com> + +- Fix Ubuntu 24.04 edge-case test failures + +- Added: + * fix-ubuntu-24.04-specific-failures-716.patch + +------------------------------------------------------------------- New: ---- fix-ubuntu-24.04-specific-failures-716.patch BETA DEBUG BEGIN: New:- Added: * fix-ubuntu-24.04-specific-failures-716.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.y9P6Fd/_old 2025-06-03 17:50:44.046624669 +0200 +++ /var/tmp/diff_new_pack.y9P6Fd/_new 2025-06-03 17:50:44.046624669 +0200 @@ -548,6 +548,9 @@ # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/commit/86245dc12c0705b5579a15dcb70724244e574d73 # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/715 Patch170: fix-debian-tests-715.patch +# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/commit/790304df995ad2415bf550cc8489230360da1bd7 +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/716 +Patch171: fix-ubuntu-24.04-specific-failures-716.patch ### IMPORTANT: The line below is used as a snippet marker. Do not touch it. ### SALT PATCHES LIST END ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.y9P6Fd/_old 2025-06-03 17:50:44.150628982 +0200 +++ /var/tmp/diff_new_pack.y9P6Fd/_new 2025-06-03 17:50:44.150628982 +0200 @@ -1,3 +1,3 @@ -41deeafbe95f941870bef0f3d2a7cca7f90b8f32 +b62d3262be6ea409dc64dc00a3057040f12b1106 (No newline at EOF) ++++++ fix-ubuntu-24.04-specific-failures-716.patch ++++++ >From 9639129b9b6fb495e7c4eec6062ef6eb4253c007 Mon Sep 17 00:00:00 2001 From: Marek Czernek <marek.czer...@suse.com> Date: Tue, 27 May 2025 10:18:59 +0200 Subject: [PATCH] Fix Ubuntu 24.04 specific failures (#716) Co-authored-by: Pedro Algarvio <pe...@algarvio.me> --- tests/pytests/functional/modules/test_pkg.py | 7 +++++-- tests/pytests/unit/modules/test_aptpkg.py | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/pytests/functional/modules/test_pkg.py b/tests/pytests/functional/modules/test_pkg.py index 72b8695512..c80bb3b0c3 100644 --- a/tests/pytests/functional/modules/test_pkg.py +++ b/tests/pytests/functional/modules/test_pkg.py @@ -204,11 +204,14 @@ def test_mod_del_repo_multiline_values(modules, refresh_db): @pytest.mark.requires_salt_modules("pkg.owner") -def test_owner(modules): +def test_owner(modules, grains): """ test finding the package owning a file """ - binary = shutil.which("ls") + binary = "/bin/ls" + if grains["os"] == "Ubuntu" and grains["osmajorrelease"] >= 24: + binary = "/usr/bin/ls" + ret = modules.pkg.owner(binary) assert len(ret) != 0 diff --git a/tests/pytests/unit/modules/test_aptpkg.py b/tests/pytests/unit/modules/test_aptpkg.py index fe4dd63eee..3d7c004ef7 100644 --- a/tests/pytests/unit/modules/test_aptpkg.py +++ b/tests/pytests/unit/modules/test_aptpkg.py @@ -924,7 +924,7 @@ def test_mod_repo_enabled(tmp_path): """ Checks if a repo is enabled or disabled depending on the passed kwargs. """ - file = tmp_path / "repo.list" + file = str(tmp_path / "repo.list") with patch.dict( aptpkg.__salt__, {"config.option": MagicMock(), "no_proxy": MagicMock(return_value=False)}, @@ -954,7 +954,7 @@ def test_mod_repo_enabled(tmp_path): data_is_true.assert_called_with(False) -def test_mod_repo_match(): +def test_mod_repo_match(tmp_path): """ Checks if a repo is matched without taking into account any ending "/" in the uri. """ @@ -967,6 +967,7 @@ def test_mod_repo_match(): ) mock_source_list = MockSourceList() mock_source_list.list = [mock_source] + file = str(tmp_path / "repo.list") with patch.dict( aptpkg.__salt__, @@ -999,13 +1000,13 @@ def test_mod_repo_match(): ) if salt.utils.path.which("apt-key"): repo = aptpkg.mod_repo( - source_line_no_slash, enabled=False + source_line_no_slash, file=file, enabled=False ) assert repo[source_line_no_slash]["uri"] == source_uri else: with pytest.raises(Exception) as err: repo = aptpkg.mod_repo( - source_line_no_slash, enabled=False + source_line_no_slash, file=file, enabled=False ) assert ( "missing 'signedby' option when apt-key is missing" -- 2.49.0
