diff --git a/convert2rhel/actions/conversion/preserve_only_rhel_kernel.py b/convert2rhel/actions/conversion/preserve_only_rhel_kernel.py index bf252e4962..ca881b8de8 100644 --- a/convert2rhel/actions/conversion/preserve_only_rhel_kernel.py +++ b/convert2rhel/actions/conversion/preserve_only_rhel_kernel.py @@ -147,7 +147,7 @@ def run(self): loggerinst.warning(description) self.add_message( level="WARNING", - id="LEFTOVER_BOOT_KERNEL_DETECTED", + id="LEFTOVER_DEFAULT_BOOT_KERNEL_DETECTED", title="Leftover boot kernel detected", description=description, ) diff --git a/convert2rhel/actions/pre_ponr_changes/handle_packages.py b/convert2rhel/actions/pre_ponr_changes/handle_packages.py index 6c246c4adf..ba20710487 100644 --- a/convert2rhel/actions/pre_ponr_changes/handle_packages.py +++ b/convert2rhel/actions/pre_ponr_changes/handle_packages.py @@ -170,7 +170,7 @@ def run(self): logger.info(message) self.add_message( level="INFO", - id="SPECIAL_PACKAGES_REMOVED", + id="SPECIAL_PACKAGES_TO_REMOVE", title="Special packages to be removed", description=( "We have identified installed packages that match a pre-defined list of packages that are" diff --git a/convert2rhel/actions/system_checks/convert2rhel_latest.py b/convert2rhel/actions/system_checks/convert2rhel_latest.py index 23a32601af..2788a06daa 100644 --- a/convert2rhel/actions/system_checks/convert2rhel_latest.py +++ b/convert2rhel/actions/system_checks/convert2rhel_latest.py @@ -190,7 +190,7 @@ def run(self): else: self.set_result( level="OVERRIDABLE", - id="OUT_OF_DATE", + id="OUTDATED_CONVERT2RHEL_VERSION", title="Outdated convert2rhel version detected", description="An outdated convert2rhel version has been detected", diagnosis=( diff --git a/convert2rhel/pkgmanager/handlers/dnf/__init__.py b/convert2rhel/pkgmanager/handlers/dnf/__init__.py index 1651f3aa3a..84c0eb082d 100644 --- a/convert2rhel/pkgmanager/handlers/dnf/__init__.py +++ b/convert2rhel/pkgmanager/handlers/dnf/__init__.py @@ -233,7 +233,7 @@ def _process_transaction(self, validate_transaction): logger.debug("Got the following exception message: %s", e) logger.critical_no_exit("Failed to validate the dnf transaction.") raise exceptions.CriticalError( - id_="FAILED_TO_VALIDATE_TRANSACTION", + id_="FAILED_TO_VALIDATE_DNF_TRANSACTION", title="Failed to validate dnf transaction.", description="During the dnf transaction execution an error occured and convert2rhel could no longer process the transaction.", diagnosis="Transaction processing failed with error: {}".format(str(e)), diff --git a/convert2rhel/pkgmanager/handlers/yum/__init__.py b/convert2rhel/pkgmanager/handlers/yum/__init__.py index 5449e7c139..a6a084ff47 100644 --- a/convert2rhel/pkgmanager/handlers/yum/__init__.py +++ b/convert2rhel/pkgmanager/handlers/yum/__init__.py @@ -320,7 +320,7 @@ def _process_transaction(self, validate_transaction): logger.debug("Got the following exception message: %s", e) logger.critical_no_exit("Failed to validate the yum transaction.") raise exceptions.CriticalError( - id_="FAILED_TO_VALIDATE_TRANSACTION", + id_="FAILED_TO_VALIDATE_YUM_TRANSACTION", title="Failed to validate yum transaction.", description="During the yum transaction execution an error occurred and convert2rhel could no longer process the transaction.", diagnosis="Transaction processing failed with error: {}".format(" ".join(e.value)), diff --git a/convert2rhel/subscription.py b/convert2rhel/subscription.py index 9b4cc736bb..48d700179c 100644 --- a/convert2rhel/subscription.py +++ b/convert2rhel/subscription.py @@ -216,7 +216,7 @@ def register_system(): ) ) raise exceptions.CriticalError( - id_="FAILED_TO_SUBSCRIBE_SYSTEM", + id_="FAILED_TO_SUBSCRIBE_SYSTEM_ETC_OS_RELEASE", title="Failed to subscribe system.", description="Failed to restore the /etc/os-release file needed for subscribing the system.", diagnosis="The restore failed with error {}.".format(str(e)), diff --git a/convert2rhel/unit_tests/actions/pre_ponr_changes/handle_packages_test.py b/convert2rhel/unit_tests/actions/pre_ponr_changes/handle_packages_test.py index 1333bd8bee..d9981a6ba1 100644 --- a/convert2rhel/unit_tests/actions/pre_ponr_changes/handle_packages_test.py +++ b/convert2rhel/unit_tests/actions/pre_ponr_changes/handle_packages_test.py @@ -177,7 +177,7 @@ def test_run_all_removed(self, monkeypatch, remove_special_packages_instance): ( actions.ActionMessage( level="INFO", - id="SPECIAL_PACKAGES_REMOVED", + id="SPECIAL_PACKAGES_TO_REMOVE", title="Special packages to be removed", description="We have identified installed packages that match a pre-defined list of packages that are" " to be removed during the conversion", @@ -219,7 +219,7 @@ def test_run_packages_not_removed(self, pretend_os, monkeypatch, remove_special_ ), actions.ActionMessage( level="INFO", - id="SPECIAL_PACKAGES_REMOVED", + id="SPECIAL_PACKAGES_TO_REMOVE", title="Special packages to be removed", description=( "We have identified installed packages that match a pre-defined list of packages that are" diff --git a/convert2rhel/unit_tests/actions/system_checks/convert2rhel_latest_test.py b/convert2rhel/unit_tests/actions/system_checks/convert2rhel_latest_test.py index dc3b973ff7..59c05d232f 100644 --- a/convert2rhel/unit_tests/actions/system_checks/convert2rhel_latest_test.py +++ b/convert2rhel/unit_tests/actions/system_checks/convert2rhel_latest_test.py @@ -155,7 +155,7 @@ def test_convert2rhel_latest_outdated_version_inhibitor( unit_tests.assert_actions_result( convert2rhel_latest_action_instance, level="OVERRIDABLE", - id="OUT_OF_DATE", + id="OUTDATED_CONVERT2RHEL_VERSION", title="Outdated convert2rhel version detected", diagnosis=( "You are currently running {} and the latest version of convert2rhel is {}.\n" @@ -485,7 +485,7 @@ def ttest_convert2rhel_latest_multiple_packages( unit_tests.assert_actions_result( convert2rhel_latest_action_instance, level="OVERRIDABLE", - id="OUT_OF_DATE", + id="OUTDATED_CONVERT2RHEL_VERSION", title="Outdated convert2rhel version detected", description="An outdated convert2rhel version has been detected", diagnosis=( @@ -671,7 +671,7 @@ def test_convert2rhel_latest_bad_nevra_to_parse_pkg_string( unit_tests.assert_actions_result( convert2rhel_latest_action_instance, level="OVERRIDABLE", - id="OUT_OF_DATE", + id="OUTDATED_CONVERT2RHEL_VERSION", title="Outdated convert2rhel version detected", description="An outdated convert2rhel version has been detected", diagnosis=( diff --git a/convert2rhel/unit_tests/pkgmanager/handlers/dnf/dnf_test.py b/convert2rhel/unit_tests/pkgmanager/handlers/dnf/dnf_test.py index ceae3ac05d..441330a0f7 100644 --- a/convert2rhel/unit_tests/pkgmanager/handlers/dnf/dnf_test.py +++ b/convert2rhel/unit_tests/pkgmanager/handlers/dnf/dnf_test.py @@ -351,7 +351,7 @@ def test_process_transaction_exceptions(self, pretend_os, caplog): assert pkgmanager.Base.do_transaction.call_count == 1 assert "Failed to validate the dnf transaction." in caplog.records[-1].message - assert "FAILED_TO_VALIDATE_TRANSACTION" in execinfo._excinfo[1].id + assert "FAILED_TO_VALIDATE_DNF_TRANSACTION" in execinfo._excinfo[1].id assert "Failed to validate dnf transaction." in execinfo._excinfo[1].title assert ( "During the dnf transaction execution an error occured and convert2rhel could no longer process the transaction." diff --git a/convert2rhel/unit_tests/pkgmanager/handlers/yum/yum_test.py b/convert2rhel/unit_tests/pkgmanager/handlers/yum/yum_test.py index f7575976f5..1b7313ce06 100644 --- a/convert2rhel/unit_tests/pkgmanager/handlers/yum/yum_test.py +++ b/convert2rhel/unit_tests/pkgmanager/handlers/yum/yum_test.py @@ -249,7 +249,7 @@ def test_process_transaction_with_exceptions(self, pretend_os, caplog, monkeypat with pytest.raises(exceptions.CriticalError) as execinfo: instance._process_transaction(validate_transaction=False) assert "Failed to validate the yum transaction." in caplog.records[-1].message - assert "FAILED_TO_VALIDATE_TRANSACTION" in execinfo._excinfo[1].id + assert "FAILED_TO_VALIDATE_YUM_TRANSACTION" in execinfo._excinfo[1].id assert "Failed to validate yum transaction." in execinfo._excinfo[1].title assert ( "During the yum transaction execution an error occurred and convert2rhel could no longer process the transaction." diff --git a/tests/integration/tier0/non-destructive/basic-sanity-checks/main.fmf b/tests/integration/tier0/non-destructive/basic-sanity-checks/main.fmf index 248695f394..6c139cb079 100644 --- a/tests/integration/tier0/non-destructive/basic-sanity-checks/main.fmf +++ b/tests/integration/tier0/non-destructive/basic-sanity-checks/main.fmf @@ -68,7 +68,7 @@ tag+: Mock newer version of convert2rhel description+: | Verify that running the newer than the latest GA version of convert2rhel - does not raise the CONVERT2RHEL_LATEST_VERSION.OUT_OF_DATE error. + does not raise the CONVERT2RHEL_LATEST_VERSION.OUTDATED_CONVERT2RHEL_VERSION error. tag+: - version-latest-or-newer - sanity @@ -80,7 +80,7 @@ tag+: Older convert2rhel version without envar description+: | Verify that running an older version of convert2rhel without CONVERT2RHEL_ALLOW_OLDER_VERSION - environment variable in place, raises CONVERT2RHEL_LATEST_VERSION.OUT_OF_DATE error. + environment variable in place, raises CONVERT2RHEL_LATEST_VERSION.OUTDATED_CONVERT2RHEL_VERSION error. tag+: - version-older-no-envar - inhibitor @@ -92,7 +92,7 @@ tag+: Older convert2rhel version with envar description+: | Verify that running an older version of convert2rhel with CONVERT2RHEL_ALLOW_OLDER_VERSION - environment variable in place, does not raise CONVERT2RHEL_LATEST_VERSION.OUT_OF_DATE. + environment variable in place, does not raise CONVERT2RHEL_LATEST_VERSION.OUTDATED_CONVERT2RHEL_VERSION. environment+: CONVERT2RHEL_ALLOW_OLDER_VERSION: 1 tag+: diff --git a/tests/integration/tier0/non-destructive/basic-sanity-checks/test_basic_sanity_checks.py b/tests/integration/tier0/non-destructive/basic-sanity-checks/test_basic_sanity_checks.py index 812d60b760..521db3e071 100644 --- a/tests/integration/tier0/non-destructive/basic-sanity-checks/test_basic_sanity_checks.py +++ b/tests/integration/tier0/non-destructive/basic-sanity-checks/test_basic_sanity_checks.py @@ -133,7 +133,7 @@ def test_c2r_version_latest_inhibitor(convert2rhel, c2r_version, version): assert ( c2r.expect_exact( - "(OVERRIDABLE) CONVERT2RHEL_LATEST_VERSION::OUT_OF_DATE - Outdated convert2rhel version detected", + "(OVERRIDABLE) CONVERT2RHEL_LATEST_VERSION::OUTDATED_CONVERT2RHEL_VERSION - Outdated convert2rhel version detected", timeout=300, ) == 0 diff --git a/tests/integration/tier0/non-destructive/single-yum-transaction-validation/test_single_yum_transaction_validation.py b/tests/integration/tier0/non-destructive/single-yum-transaction-validation/test_single_yum_transaction_validation.py index cd4d43801f..2fcc70f956 100644 --- a/tests/integration/tier0/non-destructive/single-yum-transaction-validation/test_single_yum_transaction_validation.py +++ b/tests/integration/tier0/non-destructive/single-yum-transaction-validation/test_single_yum_transaction_validation.py @@ -135,7 +135,7 @@ def test_transaction_validation_error(convert2rhel, shell, yum_cache): c2r.expect("Pre-conversion analysis report", timeout=600) c2r.expect("Must fix before conversion") c2r.expect_exact( - "VALIDATE_PACKAGE_MANAGER_TRANSACTION::FAILED_TO_VALIDATE_TRANSACTION", + "VALIDATE_PACKAGE_MANAGER_TRANSACTION::FAILED_TO_VALIDATE_YUM_TRANSACTION", timeout=600, )