diff --git a/repos/system_upgrade/common/actors/openssl/opensslconfigscanner/libraries/readconf.py b/repos/system_upgrade/common/actors/openssl/opensslconfigscanner/libraries/readconf.py index e103703372..678cc7aa51 100644 --- a/repos/system_upgrade/common/actors/openssl/opensslconfigscanner/libraries/readconf.py +++ b/repos/system_upgrade/common/actors/openssl/opensslconfigscanner/libraries/readconf.py @@ -1,5 +1,6 @@ import errno +from leapp.libraries.common.config import version from leapp.libraries.common.rpms import check_file_modification from leapp.libraries.stdlib import api from leapp.models import OpenSslConfig, OpenSslConfigBlock, OpenSslConfigPair @@ -87,6 +88,11 @@ def scan_config(producer): Parse openssl.cnf file to create OpenSslConfig message. """ + if version.get_source_major_version() == '7': + # Apply this only for EL 8+ as we are not interested about this + # on EL 7 anymore (moved from el8toel9) + return + # direct access to configuration file output = read_config() config = parse_config(output) diff --git a/repos/system_upgrade/common/actors/openssl/opensslconfigscanner/tests/test_opensslconfigscanner.py b/repos/system_upgrade/common/actors/openssl/opensslconfigscanner/tests/test_opensslconfigscanner.py index bb6d7b3fda..8978e13349 100644 --- a/repos/system_upgrade/common/actors/openssl/opensslconfigscanner/tests/test_opensslconfigscanner.py +++ b/repos/system_upgrade/common/actors/openssl/opensslconfigscanner/tests/test_opensslconfigscanner.py @@ -1,6 +1,7 @@ import pytest from leapp.libraries.actor.readconf import parse_config, produce_config, strip_whitespace_and_comments +from leapp.libraries.common.config import version from leapp.models import OpenSslConfig, OpenSslConfigBlock, OpenSslConfigPair testdata = ( @@ -141,6 +142,15 @@ def fake_producer(*args): assert cfg.blocks[2].pairs[0].value == "/etc/crypto-policies/back-ends/opensslcnf.config" -def test_actor_execution(current_actor_context): +@pytest.mark.parametrize(('source_version', 'should_run'), [ + ('7', False), + ('8', True), + ('9', True), +]) +def test_actor_execution(monkeypatch, current_actor_context, source_version, should_run): + monkeypatch.setattr(version, 'get_source_major_version', lambda: source_version) current_actor_context.run() - assert current_actor_context.consume(OpenSslConfig) + if should_run: + assert current_actor_context.consume(OpenSslConfig) + else: + assert not current_actor_context.consume(OpenSslConfig)