66d3ee645d
- Requires leapp-framework 6.2+ - Modernize the storage initialization when booting to the upgrade environment - Fix the upgrade on s390x LPAR when rootfs is on LVM - Fix the detection of encrypted Ceph OSD containers - Fix unlocking of LUKS devices when applied on non-rootfs file systems - Detect potentially harmful third party python modules for the target python version - Handle correctly live kernel patching during IPU - Inhibit the upgrade if pluginpath is configured explicitly in DNF - Introduce `--target-os` option to specify target distribution for possible conversion during the upgrade - Introduce the `--target-version` alias for the `--target` option - Minor changes in logs and reports - Prevent sssdupdate actor from rising errors that could stop the upgrade - Respect repomapping on CentOS-like distributions - Respect repomapping when converting the system to different Linux distribution - Skip empty lines when parsing dumped DNF config to prevent confusing warning log - Update the leapp data files - Update test plans - Resolves: RHEL-76159, RHEL-95983, RHEL-108025, RHEL-108992, RHEL-110563, RHEL-119546
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From db8d1f3fcc155b94b07d89d90eb82cd2a52d5cf9 Mon Sep 17 00:00:00 2001
|
|
From: Matej Matuska <mmatuska@redhat.com>
|
|
Date: Wed, 20 Aug 2025 15:41:34 +0200
|
|
Subject: [PATCH 07/69] networkmanagerconnectionscanner: Skip test on Python !=
|
|
3.6
|
|
|
|
The test_nm_conn tests fails on at least Python >= 3.9 (not sure which
|
|
version exactly).
|
|
|
|
Let's skip the test on Python != 3.6 as they never run on a different
|
|
version - the actor is in the el8toel9 repo and is in FactsPhase.
|
|
---
|
|
.../unit_test_networkmanagerconnectionscanner.py | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/repos/system_upgrade/el8toel9/actors/networkmanagerconnectionscanner/tests/unit_test_networkmanagerconnectionscanner.py b/repos/system_upgrade/el8toel9/actors/networkmanagerconnectionscanner/tests/unit_test_networkmanagerconnectionscanner.py
|
|
index 46af07c1..7558b307 100644
|
|
--- a/repos/system_upgrade/el8toel9/actors/networkmanagerconnectionscanner/tests/unit_test_networkmanagerconnectionscanner.py
|
|
+++ b/repos/system_upgrade/el8toel9/actors/networkmanagerconnectionscanner/tests/unit_test_networkmanagerconnectionscanner.py
|
|
@@ -1,4 +1,5 @@
|
|
import errno
|
|
+import sys
|
|
import textwrap
|
|
|
|
import pytest
|
|
@@ -57,7 +58,16 @@ def test_no_conf(monkeypatch):
|
|
assert not api.produce.called
|
|
|
|
|
|
-@pytest.mark.skipif(not nmconnscanner.libnm_available, reason="NetworkManager g-ir not installed")
|
|
+@pytest.mark.skipif(
|
|
+ sys.version_info.major != 3 or sys.version_info.minor != 6,
|
|
+ # On Python > 3.6 the GLib and NM libraries apparently behave differently and
|
|
+ # the test fails. Let's skip it since the actor it's only ever run with
|
|
+ # Python3.6 (el8toel9 repo and FactsPhase)
|
|
+ reason="Only runs on Python 3.6",
|
|
+)
|
|
+@pytest.mark.skipif(
|
|
+ not nmconnscanner.libnm_available, reason="NetworkManager g-ir not installed"
|
|
+)
|
|
def test_nm_conn(monkeypatch):
|
|
"""
|
|
Check a basic keyfile
|
|
--
|
|
2.51.1
|
|
|