From fce2f30d5ac44d891bf095f9cb0e5c64b4e5d407 Mon Sep 17 00:00:00 2001 From: john feng Date: Thu, 26 Sep 2024 14:39:36 -0700 Subject: [PATCH] refactor code --- src/core/src/package_managers/YumPackageManager.py | 6 +++--- src/core/tests/Test_YumPackageManager.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/src/package_managers/YumPackageManager.py b/src/core/src/package_managers/YumPackageManager.py index 78f503d1..1568906e 100644 --- a/src/core/src/package_managers/YumPackageManager.py +++ b/src/core/src/package_managers/YumPackageManager.py @@ -144,7 +144,7 @@ def get_security_updates(self): """Get missing security updates""" self.composite_logger.log("\nDiscovering 'security' packages...") - if not self.__is_image_rhel8_higher(): + if not self.__is_image_rhel8_or_higher(): self.install_yum_security_prerequisite() out = self.invoke_package_manager(self.yum_check_security) @@ -179,8 +179,8 @@ def get_other_updates(self): self.composite_logger.log("Discovered " + str(len(other_packages)) + " 'other' package entries.") return other_packages, other_package_versions - def __is_image_rhel8_higher(self): - """ Check if image is RHEL8+ set true else false """ + def __is_image_rhel8_or_higher(self): + """ Check if image is RHEL8+ return true else false """ if self.env_layer.platform.linux_distribution() is not None: os_offer, os_version, os_code = self.env_layer.platform.linux_distribution() diff --git a/src/core/tests/Test_YumPackageManager.py b/src/core/tests/Test_YumPackageManager.py index 39960108..db9be641 100644 --- a/src/core/tests/Test_YumPackageManager.py +++ b/src/core/tests/Test_YumPackageManager.py @@ -626,7 +626,7 @@ def test_obsolete_packages_should_not_considered_in_available_updates(self): self.assertTrue(available_updates[0] == "grub2-tools.x86_64") self.assertTrue(package_versions[0] == "1:2.02-142.el8") - def test_rhel8_image_lower_with_security_plugin(self): + def test_rhel7_image_with_security_plugin(self): """Unit test for yum package manager rhel images below 8 and Classification = Security""" # mock linux_distribution backup_envlayer_platform_linux_distribution = LegacyEnvLayerExtensions.LegacyPlatform.linux_distribution