ykohut/leapp-repository
1
0
Fork 0
forked from rpms/leapp-repository
Code Pull Requests Activity
316902b8f7
leapp-repository/SOURCES/0043-Set-CurrentActorMocked-src-dst-version-to-8-9-values.patch
eabdullin 316902b8f7 Import from CS git
2025-12-01 09:14:24 +00:00

485 lines
25 KiB
Diff
Raw Blame History

From adac307afff48ebbf4255edbd620ed29cbc9429e Mon Sep 17 00:00:00 2001
From: Matej Matuska <mmatuska@redhat.com>
Date: Thu, 21 Aug 2025 13:12:19 +0200
Subject: [PATCH 43/55] Set CurrentActorMocked src/dst version to 8->9 values
Currently, the default upgrade path is 7.8->8.1 which has been dropped
from the repo. Several tests make assumptions about these defaults and in
some cases this means that code path for other general upgrade paths
(8->9, 9->10) are left untested e.g. modify_userspace_for_livemode.
This patch changes the default path to 8.10->9.6.
Updated tests:
- checkrhui: assume 8->9 upgrade path
- setuptargetrepos: Update tests to assume 8->9 upg path.
- repairsystemdsymlinks: use 8->9 upgrade path instead of 7->8:
We need to mock some "installation changed" service as there is
*currently* none.
- checkmemory: assume 8->9 upgrade path
- peseventsscanner: assume 8->9 upgrade path
- lib/config: assume correct upgrade path
- persistentnetnamesconfig: use 8->9 upgrade path instead of 7->8
Jira: RHELMISC-16538
---
.../checkmemory/tests/test_checkmemory.py | 2 +-
.../tests/component_test_checkrhui.py | 20 +++---
.../libraries/persistentnetnamesconfig.py | 24 +++----
.../tests/test_persistentnetnamesconfig.py | 16 ++++-
.../tests/test_pes_event_scanner.py | 14 ++--
.../tests/test_setuptargetrepos.py | 68 +++++++++----------
.../libraries/repairsystemdsymlinks.py | 1 -
.../tests/test_repairsystemdsymlinks.py | 29 +++++---
.../libraries/config/tests/test_version.py | 2 +-
.../common/libraries/testutils.py | 2 +-
10 files changed, 98 insertions(+), 80 deletions(-)
diff --git a/repos/system_upgrade/common/actors/checkmemory/tests/test_checkmemory.py b/repos/system_upgrade/common/actors/checkmemory/tests/test_checkmemory.py
index a0bac0a9..79158dc6 100644
--- a/repos/system_upgrade/common/actors/checkmemory/tests/test_checkmemory.py
+++ b/repos/system_upgrade/common/actors/checkmemory/tests/test_checkmemory.py
@@ -21,7 +21,7 @@ def test_check_memory_high(monkeypatch):
def test_report(monkeypatch):
- title_msg = 'Minimum memory requirements for RHEL 8 are not met'
+ title_msg = 'Minimum memory requirements for RHEL 9 are not met'
monkeypatch.setattr(api, 'current_actor', CurrentActorMocked())
monkeypatch.setattr(api, 'consume', lambda x: iter([MemoryInfo(mem_total=129)]))
monkeypatch.setattr(reporting, "create_report", create_report_mocked())
diff --git a/repos/system_upgrade/common/actors/cloud/checkrhui/tests/component_test_checkrhui.py b/repos/system_upgrade/common/actors/cloud/checkrhui/tests/component_test_checkrhui.py
index 02ca352e..2e6f279e 100644
--- a/repos/system_upgrade/common/actors/cloud/checkrhui/tests/component_test_checkrhui.py
+++ b/repos/system_upgrade/common/actors/cloud/checkrhui/tests/component_test_checkrhui.py
@@ -279,10 +279,14 @@ class ExpectedAction(Enum):
)
def test_process(monkeypatch, extra_installed_pkgs, skip_rhsm, expected_action):
known_setups = {
- RHUIFamily('rhui-variant'): [
- mk_rhui_setup(clients={'src_pkg'}, os_version='7'),
- mk_rhui_setup(clients={'target_pkg'}, os_version='8', leapp_pkg='leapp_pkg',
- mandatory_files=[('file1', '/etc'), ('file2', '/var')]),
+ RHUIFamily("rhui-variant"): [
+ mk_rhui_setup(clients={"src_pkg"}, os_version="8"),
+ mk_rhui_setup(
+ clients={"target_pkg"},
+ os_version="9",
+ leapp_pkg="leapp_pkg",
+ mandatory_files=[("file1", "/etc"), ("file2", "/var")],
+ ),
]
}
@@ -291,7 +295,7 @@ def test_process(monkeypatch, extra_installed_pkgs, skip_rhsm, expected_action):
installed_rpms = InstalledRPM(items=installed_pkgs)
monkeypatch.setattr(api, 'produce', produce_mocked())
- actor = CurrentActorMocked(src_ver='7.9', msgs=[installed_rpms], config=_make_default_config(all_rhui_cfg))
+ actor = CurrentActorMocked(msgs=[installed_rpms], config=_make_default_config(all_rhui_cfg))
monkeypatch.setattr(api, 'current_actor', actor)
monkeypatch.setattr(reporting, 'create_report', create_report_mocked())
monkeypatch.setattr(rhsm, 'skip_rhsm', lambda: skip_rhsm)
@@ -318,12 +322,12 @@ def test_unknown_target_rhui_setup(monkeypatch, is_target_setup_known):
rhui_family = RHUIFamily('rhui-variant')
known_setups = {
rhui_family: [
- mk_rhui_setup(clients={'src_pkg'}, os_version='7'),
+ mk_rhui_setup(clients={'src_pkg'}, os_version='8'),
]
}
if is_target_setup_known:
- target_setup = mk_rhui_setup(clients={'target_pkg'}, os_version='8', leapp_pkg='leapp_pkg')
+ target_setup = mk_rhui_setup(clients={'target_pkg'}, os_version='9', leapp_pkg='leapp_pkg')
known_setups[rhui_family].append(target_setup)
installed_pkgs = {'zip', 'kernel-core', 'python', 'src_pkg', 'leapp_pkg'}
@@ -331,7 +335,7 @@ def test_unknown_target_rhui_setup(monkeypatch, is_target_setup_known):
installed_rpms = InstalledRPM(items=installed_pkgs)
monkeypatch.setattr(api, 'produce', produce_mocked())
- actor = CurrentActorMocked(src_ver='7.9', msgs=[installed_rpms], config=_make_default_config(all_rhui_cfg))
+ actor = CurrentActorMocked(msgs=[installed_rpms], config=_make_default_config(all_rhui_cfg))
monkeypatch.setattr(api, 'current_actor', actor)
monkeypatch.setattr(reporting, 'create_report', create_report_mocked())
monkeypatch.setattr(rhsm, 'skip_rhsm', lambda: True)
diff --git a/repos/system_upgrade/common/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py b/repos/system_upgrade/common/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py
index c90d13f2..189cd4d0 100644
--- a/repos/system_upgrade/common/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py
+++ b/repos/system_upgrade/common/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py
@@ -55,21 +55,21 @@ def process():
)
return
- rhel7_ifaces = next(api.consume(PersistentNetNamesFacts)).interfaces
- rhel8_ifaces = next(api.consume(PersistentNetNamesFactsInitramfs)).interfaces
+ source_ifaces = next(api.consume(PersistentNetNamesFacts)).interfaces
+ target_ifaces = next(api.consume(PersistentNetNamesFactsInitramfs)).interfaces
- rhel7_ifaces_map = {iface.mac: iface for iface in rhel7_ifaces}
- rhel8_ifaces_map = {iface.mac: iface for iface in rhel8_ifaces}
+ source_ifaces_map = {iface.mac: iface for iface in source_ifaces}
+ target_ifaces_map = {iface.mac: iface for iface in target_ifaces}
initrd_files = []
missing_ifaces = []
renamed_interfaces = []
- if rhel7_ifaces != rhel8_ifaces:
- for iface in rhel7_ifaces:
- rhel7_name = rhel7_ifaces_map[iface.mac].name
+ if source_ifaces != target_ifaces:
+ for iface in source_ifaces:
+ source_name = source_ifaces_map[iface.mac].name
try:
- rhel8_name = rhel8_ifaces_map[iface.mac].name
+ target_name = target_ifaces_map[iface.mac].name
except KeyError:
missing_ifaces.append(iface)
api.current_logger().warning(
@@ -80,13 +80,13 @@ def process():
)
continue
- if rhel7_name != rhel8_name and get_env('LEAPP_NO_NETWORK_RENAMING', '0') != '1':
- api.current_logger().warning('Detected interface rename {} -> {}.'.format(rhel7_name, rhel8_name))
+ if source_name != target_name and get_env('LEAPP_NO_NETWORK_RENAMING', '0') != '1':
+ api.current_logger().warning('Detected interface rename {} -> {}.'.format(source_name, target_name))
if re.search('eth[0-9]+', iface.name) is not None:
api.current_logger().warning('Interface named using eth prefix, refusing to generate link file')
- renamed_interfaces.append(RenamedInterface(**{'rhel7_name': rhel7_name,
- 'rhel8_name': rhel8_name}))
+ renamed_interfaces.append(RenamedInterface(**{'rhel7_name': source_name,
+ 'rhel8_name': target_name}))
continue
initrd_files.append(generate_link_file(iface))
diff --git a/repos/system_upgrade/common/actors/persistentnetnamesconfig/tests/test_persistentnetnamesconfig.py b/repos/system_upgrade/common/actors/persistentnetnamesconfig/tests/test_persistentnetnamesconfig.py
index ee199ae4..c584c7ea 100644
--- a/repos/system_upgrade/common/actors/persistentnetnamesconfig/tests/test_persistentnetnamesconfig.py
+++ b/repos/system_upgrade/common/actors/persistentnetnamesconfig/tests/test_persistentnetnamesconfig.py
@@ -12,7 +12,6 @@ from leapp.models import (
PCIAddress,
PersistentNetNamesFacts,
PersistentNetNamesFactsInitramfs,
- RenamedInterface,
RenamedInterfaces,
TargetInitramfsTasks
)
@@ -170,7 +169,12 @@ def test_bz_1899455_crash_iface(monkeypatch, adjust_cwd):
PersistentNetNamesFactsInitramfs.create(json_msgs["PersistentNetNamesFactsInitramfs"]),
]
monkeypatch.setattr(persistentnetnamesconfig, 'generate_link_file', generate_link_file_mocked)
- monkeypatch.setattr(persistentnetnamesconfig.api, 'current_actor', CurrentActorMocked(msgs=msgs))
+ monkeypatch.setattr(
+ persistentnetnamesconfig.api,
+ "current_actor",
+ # without this the actor exits early
+ CurrentActorMocked(msgs=msgs, envars={"LEAPP_DISABLE_NET_NAMING_SCHEMES": "1"}),
+ )
monkeypatch.setattr(persistentnetnamesconfig.api, 'current_logger', logger_mocked())
monkeypatch.setattr(persistentnetnamesconfig.api, 'produce', produce_mocked())
persistentnetnamesconfig.process()
@@ -194,7 +198,13 @@ def test_no_network_renaming(monkeypatch):
msgs = [PersistentNetNamesFacts(interfaces=interfaces)]
interfaces[0].name = 'changedinterfacename0'
msgs.append(PersistentNetNamesFactsInitramfs(interfaces=interfaces))
- mocked_actor = CurrentActorMocked(msgs=msgs, envars={'LEAPP_NO_NETWORK_RENAMING': '1'})
+ mocked_actor = CurrentActorMocked(
+ msgs=msgs,
+ envars={
+ "LEAPP_DISABLE_NET_NAMING_SCHEMES": "1",
+ "LEAPP_NO_NETWORK_RENAMING": "1",
+ },
+ )
monkeypatch.setattr(persistentnetnamesconfig.api, 'current_actor', mocked_actor)
monkeypatch.setattr(persistentnetnamesconfig.api, 'current_logger', logger_mocked())
monkeypatch.setattr(persistentnetnamesconfig.api, 'produce', produce_mocked())
diff --git a/repos/system_upgrade/common/actors/peseventsscanner/tests/test_pes_event_scanner.py b/repos/system_upgrade/common/actors/peseventsscanner/tests/test_pes_event_scanner.py
index 09a1e82d..f67f3840 100644
--- a/repos/system_upgrade/common/actors/peseventsscanner/tests/test_pes_event_scanner.py
+++ b/repos/system_upgrade/common/actors/peseventsscanner/tests/test_pes_event_scanner.py
@@ -325,18 +325,18 @@ def test_blacklisted_repoid_is_not_produced(monkeypatch):
Test that upgrade with a package that would be from a blacklisted repository on the target system does not remove
the package as it was already installed, however, the blacklisted repoid should not be produced.
"""
- installed_pkgs = {Package('pkg-a', 'blacklisted-rhel7', None), Package('pkg-b', 'repoid-rhel7', None)}
+ installed_pkgs = {Package('pkg-a', 'blacklisted-rhel8', None), Package('pkg-b', 'repoid-rhel8', None)}
events = [
- Event(1, Action.MOVED, {Package('pkg-b', 'repoid-rhel7', None)}, {Package('pkg-b', 'repoid-rhel8', None)},
- (8, 0), (8, 1), []),
- Event(2, Action.MOVED, {Package('pkg-a', 'repoid-rhel7', None)}, {Package('pkg-a', 'blacklisted-rhel8', None)},
- (8, 0), (8, 1), []),
+ Event(1, Action.MOVED, {Package('pkg-b', 'repoid-rhel8', None)}, {Package('pkg-b', 'repoid-rhel9', None)},
+ (9, 0), (9, 1), []),
+ Event(2, Action.MOVED, {Package('pkg-a', 'repoid-rhel8', None)}, {Package('pkg-a', 'blacklisted-rhel9', None)},
+ (9, 0), (9, 1), []),
]
monkeypatch.setattr(pes_events_scanner, 'get_installed_pkgs', lambda: installed_pkgs)
monkeypatch.setattr(pes_events_scanner, 'get_pes_events', lambda folder, filename: events)
monkeypatch.setattr(pes_events_scanner, 'apply_transaction_configuration', lambda pkgs, transaction_cfg: pkgs)
- monkeypatch.setattr(pes_events_scanner, 'get_blacklisted_repoids', lambda: {'blacklisted-rhel8'})
+ monkeypatch.setattr(pes_events_scanner, 'get_blacklisted_repoids', lambda: {'blacklisted-rhel9'})
monkeypatch.setattr(pes_events_scanner, 'replace_pesids_with_repoids_in_packages',
lambda pkgs, src_pkgs_repoids: pkgs)
@@ -357,7 +357,7 @@ def test_blacklisted_repoid_is_not_produced(monkeypatch):
repo_setup_tasks = [msg for msg in api.produce.model_instances if isinstance(msg, RepositoriesSetupTasks)]
assert len(repo_setup_tasks) == 1
- assert repo_setup_tasks[0].to_enable == ['repoid-rhel8']
+ assert repo_setup_tasks[0].to_enable == ['repoid-rhel9']
@pytest.mark.parametrize(
diff --git a/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_setuptargetrepos.py b/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_setuptargetrepos.py
index e4a30f7f..ce7f01c0 100644
--- a/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_setuptargetrepos.py
+++ b/repos/system_upgrade/common/actors/setuptargetrepos/tests/test_setuptargetrepos.py
@@ -1,6 +1,5 @@
import pytest
-from leapp.libraries import stdlib
from leapp.libraries.actor import setuptargetrepos
from leapp.libraries.common.testutils import CurrentActorMocked, produce_mocked
from leapp.libraries.stdlib import api
@@ -15,8 +14,7 @@ from leapp.models import (
RepositoriesSetupTasks,
RepositoryData,
RepositoryFile,
- RPM,
- TargetRepositories
+ RPM
)
RH_PACKAGER = 'Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>'
@@ -108,27 +106,27 @@ def test_repos_mapping_for_distro(monkeypatch, distro_id):
the RepositoriesMapping information for a specific distro.
"""
repos_data = [
- RepositoryData(repoid='{}-7-server-rpms'.format(distro_id), name='{} 7 Server'.format(distro_id)),
- RepositoryData(repoid='{}-7-blacklisted-rpms'.format(distro_id), name='{} 7 Blacklisted'.format(distro_id))]
+ RepositoryData(repoid='{}-8-server-rpms'.format(distro_id), name='{} 8 Server'.format(distro_id)),
+ RepositoryData(repoid='{}-8-blacklisted-rpms'.format(distro_id), name='{} 8 Blacklisted'.format(distro_id))]
repos_files = [RepositoryFile(file='/etc/yum.repos.d/redhat.repo', data=repos_data)]
facts = RepositoriesFacts(repositories=repos_files)
installed_rpms = InstalledRPM(
- items=[mock_package('foreman', '{}-7-for-x86_64-satellite-extras-rpms'.format(distro_id)),
- mock_package('foreman-proxy', 'nosuch-{}-7-for-x86_64-satellite-extras-rpms'.format(distro_id))])
+ items=[mock_package('foreman', '{}-8-for-x86_64-satellite-extras-rpms'.format(distro_id)),
+ mock_package('foreman-proxy', 'nosuch-{}-8-for-x86_64-satellite-extras-rpms'.format(distro_id))])
repomap = RepositoriesMapping(
- mapping=[RepoMapEntry(source='{0}7-base'.format(distro_id),
- target=['{0}8-baseos'.format(distro_id),
- '{0}8-appstream'.format(distro_id),
- '{0}8-blacklist'.format(distro_id)]),
- RepoMapEntry(source='{0}7-satellite-extras'.format(distro_id),
- target=['{0}8-satellite-extras'.format(distro_id)])],
+ mapping=[RepoMapEntry(source='{0}8-base'.format(distro_id),
+ target=['{0}9-baseos'.format(distro_id),
+ '{0}9-appstream'.format(distro_id),
+ '{0}9-blacklist'.format(distro_id)]),
+ RepoMapEntry(source='{0}8-satellite-extras'.format(distro_id),
+ target=['{0}9-satellite-extras'.format(distro_id)])],
repositories=[
PESIDRepositoryEntry(
- pesid='{0}7-base'.format(distro_id),
- repoid='{0}-7-server-rpms'.format(distro_id),
- major_version='7',
+ pesid='{0}8-base'.format(distro_id),
+ repoid='{0}-8-server-rpms'.format(distro_id),
+ major_version='8',
arch='x86_64',
repo_type='rpm',
channel='ga',
@@ -136,9 +134,9 @@ def test_repos_mapping_for_distro(monkeypatch, distro_id):
distro=distro_id,
),
PESIDRepositoryEntry(
- pesid='{0}8-baseos'.format(distro_id),
- repoid='{0}-8-for-x86_64-baseos-htb-rpms'.format(distro_id),
- major_version='8',
+ pesid='{0}9-baseos'.format(distro_id),
+ repoid='{0}-9-for-x86_64-baseos-htb-rpms'.format(distro_id),
+ major_version='9',
arch='x86_64',
repo_type='rpm',
channel='ga',
@@ -146,9 +144,9 @@ def test_repos_mapping_for_distro(monkeypatch, distro_id):
distro=distro_id,
),
PESIDRepositoryEntry(
- pesid='{0}8-appstream'.format(distro_id),
- repoid='{0}-8-for-x86_64-appstream-htb-rpms'.format(distro_id),
- major_version='8',
+ pesid='{0}9-appstream'.format(distro_id),
+ repoid='{0}-9-for-x86_64-appstream-htb-rpms'.format(distro_id),
+ major_version='9',
arch='x86_64',
repo_type='rpm',
channel='ga',
@@ -156,9 +154,9 @@ def test_repos_mapping_for_distro(monkeypatch, distro_id):
distro=distro_id,
),
PESIDRepositoryEntry(
- pesid='{0}8-blacklist'.format(distro_id),
- repoid='{0}-8-blacklisted-rpms'.format(distro_id),
- major_version='8',
+ pesid='{0}9-blacklist'.format(distro_id),
+ repoid='{0}-9-blacklisted-rpms'.format(distro_id),
+ major_version='9',
arch='x86_64',
repo_type='rpm',
channel='ga',
@@ -166,9 +164,9 @@ def test_repos_mapping_for_distro(monkeypatch, distro_id):
distro=distro_id,
),
PESIDRepositoryEntry(
- pesid='{0}7-satellite-extras'.format(distro_id),
- repoid='{0}-7-for-x86_64-satellite-extras-rpms'.format(distro_id),
- major_version='7',
+ pesid='{0}8-satellite-extras'.format(distro_id),
+ repoid='{0}-8-for-x86_64-satellite-extras-rpms'.format(distro_id),
+ major_version='8',
arch='x86_64',
repo_type='rpm',
channel='ga',
@@ -176,9 +174,9 @@ def test_repos_mapping_for_distro(monkeypatch, distro_id):
distro=distro_id,
),
PESIDRepositoryEntry(
- pesid='{0}8-satellite-extras'.format(distro_id),
- repoid='{0}-8-for-x86_64-satellite-extras-rpms'.format(distro_id),
- major_version='8',
+ pesid='{0}9-satellite-extras'.format(distro_id),
+ repoid='{0}-9-for-x86_64-satellite-extras-rpms'.format(distro_id),
+ major_version='9',
arch='x86_64',
repo_type='rpm',
channel='ga',
@@ -188,7 +186,7 @@ def test_repos_mapping_for_distro(monkeypatch, distro_id):
]
)
- repos_blacklisted = RepositoriesBlacklisted(repoids=['{}-8-blacklisted-rpms'.format(distro_id)])
+ repos_blacklisted = RepositoriesBlacklisted(repoids=['{}-9-blacklisted-rpms'.format(distro_id)])
msgs = [facts, repomap, repos_blacklisted, installed_rpms]
@@ -207,9 +205,9 @@ def test_repos_mapping_for_distro(monkeypatch, distro_id):
produced_rhel_repoids = {repo.repoid for repo in rhel_repos}
expected_repoids = {
- "{0}-8-for-x86_64-baseos-htb-rpms".format(distro_id),
- "{0}-8-for-x86_64-appstream-htb-rpms".format(distro_id),
- "{0}-8-for-x86_64-satellite-extras-rpms".format(distro_id),
+ "{0}-9-for-x86_64-baseos-htb-rpms".format(distro_id),
+ "{0}-9-for-x86_64-appstream-htb-rpms".format(distro_id),
+ "{0}-9-for-x86_64-satellite-extras-rpms".format(distro_id),
}
assert produced_distro_repoids == expected_repoids
diff --git a/repos/system_upgrade/common/actors/systemd/repairsystemdsymlinks/libraries/repairsystemdsymlinks.py b/repos/system_upgrade/common/actors/systemd/repairsystemdsymlinks/libraries/repairsystemdsymlinks.py
index 3fcf4aa6..a8e801b9 100644
--- a/repos/system_upgrade/common/actors/systemd/repairsystemdsymlinks/libraries/repairsystemdsymlinks.py
+++ b/repos/system_upgrade/common/actors/systemd/repairsystemdsymlinks/libraries/repairsystemdsymlinks.py
@@ -7,7 +7,6 @@ from leapp.libraries.stdlib import api, CalledProcessError, run
from leapp.models import SystemdBrokenSymlinksSource, SystemdBrokenSymlinksTarget, SystemdServicesInfoSource
_INSTALLATION_CHANGED = {
- '8': ['rngd.service', 'sysstat.service'],
'9': [],
'10': [],
}
diff --git a/repos/system_upgrade/common/actors/systemd/repairsystemdsymlinks/tests/test_repairsystemdsymlinks.py b/repos/system_upgrade/common/actors/systemd/repairsystemdsymlinks/tests/test_repairsystemdsymlinks.py
index 5771fc6c..d52abdfa 100644
--- a/repos/system_upgrade/common/actors/systemd/repairsystemdsymlinks/tests/test_repairsystemdsymlinks.py
+++ b/repos/system_upgrade/common/actors/systemd/repairsystemdsymlinks/tests/test_repairsystemdsymlinks.py
@@ -1,13 +1,8 @@
from leapp.libraries.actor import repairsystemdsymlinks
from leapp.libraries.common import systemd
-from leapp.libraries.common.testutils import CurrentActorMocked, logger_mocked
-from leapp.libraries.stdlib import api, CalledProcessError, run
-from leapp.models import (
- SystemdBrokenSymlinksSource,
- SystemdBrokenSymlinksTarget,
- SystemdServiceFile,
- SystemdServicesInfoSource
-)
+from leapp.libraries.common.testutils import CurrentActorMocked
+from leapp.libraries.stdlib import api
+from leapp.models import SystemdServiceFile, SystemdServicesInfoSource
class MockedSystemdCmd:
@@ -20,8 +15,16 @@ class MockedSystemdCmd:
def test_bad_symslinks(monkeypatch):
+ # there is no _INSTALLATION_CHANGED service on RHEL 8 and RHEL 9, but it's
+ # possible such service will be discovered and added in the future as it
+ # was on RHEL 7, so let's add such case
+ monkeypatch.setitem(
+ repairsystemdsymlinks._INSTALLATION_CHANGED,
+ "9", ["some.service"],
+ )
+
service_files = [
- SystemdServiceFile(name='rngd.service', state='enabled'),
+ SystemdServiceFile(name='some.service', state='enabled'),
SystemdServiceFile(name='sysstat.service', state='disabled'),
SystemdServiceFile(name='hello.service', state='enabled'),
SystemdServiceFile(name='world.service', state='disabled'),
@@ -36,11 +39,15 @@ def test_bad_symslinks(monkeypatch):
monkeypatch.setattr(systemd, 'reenable_unit', reenable_mocked)
service_info = SystemdServicesInfoSource(service_files=service_files)
- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(msgs=[service_info]))
+ monkeypatch.setattr(
+ api,
+ "current_actor",
+ CurrentActorMocked(src_ver="8.10", dst_ver="9.6", msgs=[service_info]),
+ )
repairsystemdsymlinks._handle_bad_symlinks(service_info.service_files)
- assert reenable_mocked.units == ['rngd.service']
+ assert reenable_mocked.units == ['some.service']
def test_handle_newly_broken_symlink(monkeypatch):
diff --git a/repos/system_upgrade/common/libraries/config/tests/test_version.py b/repos/system_upgrade/common/libraries/config/tests/test_version.py
index d51f8098..f36dbc5f 100644
--- a/repos/system_upgrade/common/libraries/config/tests/test_version.py
+++ b/repos/system_upgrade/common/libraries/config/tests/test_version.py
@@ -94,7 +94,7 @@ def test_matches_source_version(monkeypatch, result, version_list):
(False, ['8.2', '8.0']),
])
def test_matches_target_version(monkeypatch, result, version_list):
- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(src_ver='7.6'))
+ monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(src_ver='7.6', dst_ver='8.1'))
assert version.matches_target_version(*version_list) == result
diff --git a/repos/system_upgrade/common/libraries/testutils.py b/repos/system_upgrade/common/libraries/testutils.py
index e84cc03a..107ad8a7 100644
--- a/repos/system_upgrade/common/libraries/testutils.py
+++ b/repos/system_upgrade/common/libraries/testutils.py
@@ -80,7 +80,7 @@ def _make_default_config(actor_config_schema):
class CurrentActorMocked: # pylint:disable=R0904
def __init__(self, arch=architecture.ARCH_X86_64, envars=None, # pylint:disable=R0913
kernel='3.10.0-957.43.1.el7.x86_64',
- release_id='rhel', src_ver='7.8', dst_ver='8.1', msgs=None, flavour='default', config=None,
+ release_id='rhel', src_ver='8.10', dst_ver='9.6', msgs=None, flavour='default', config=None,
virtual_source_version=None, virtual_target_version=None,
supported_upgrade_paths=None):
"""
--
2.51.1
View Git Blame Copy Permalink