add ut for extract_linux_distribution_os_info

Author: feng-j678

src/core/src/bootstrap/EnvLayer.py

@@ -299,11 +299,11 @@ def linux_distribution(self):
                 code, output = self.__read_record(operation)
                 return eval(output)
 
-        def linux_distribution_images_details(self):
+        def extract_linux_distribution_os_info(self):
+            # type: () -> tuple
             """
             Extract os information: offer, version, code
-            Returns:
-                tuple: A tuple containing (os_offer, os_version, os_code).
+            Returns: tuple: A tuple of (os_offer, os_version, os_code).
             """
             os_offer, os_version, os_code = None, None, None
             if self.linux_distribution() is not None:

src/core/src/package_managers/YumPackageManager.py

@@ -175,7 +175,7 @@ def get_other_updates(self):
     def __is_image_rhel8_or_higher(self):
         # type: () -> bool
         """ Check if image is RHEL8+ return true else false """
-        os_offer, os_version, os_code = self.env_layer.platform.linux_distribution_images_details()
+        os_offer, os_version, os_code = self.env_layer.platform.extract_linux_distribution_os_info()
         if "Red Hat Enterprise Linux" in os_offer and int(os_version.split('.')[0]) >= 8:
             self.composite_logger.log_debug("[YPM] RHEL version >= 8 detected. [DetectedVersion={0}]".format(str(os_version)))
             return True
@@ -184,7 +184,7 @@ def __is_image_rhel8_or_higher(self):
     def __is_image_rhel(self):
         # type: () -> bool
         """ Check if image is RHEL return true else false """
-        os_offer, os_version, os_code = self.env_layer.platform.linux_distribution_images_details()
+        os_offer, os_version, os_code = self.env_layer.platform.extract_linux_distribution_os_info()
         if "Red Hat Enterprise Linux" in os_offer:
             return True
         return False

src/core/tests/Test_EnvLayer.py

@@ -85,7 +85,47 @@ def test_get_package_manager(self):
         self.envlayer.run_command_output = self.backup_run_command_output
         self.envlayer.platform.linux_distribution = self.backup_linux_distribution
         platform.system = self.backup_platform_system
-
+        
+    def test_extract_linux_distribution_os_info_with_data(self):
+        """ Test linux_distribution_images_details returning tuples of os info. """
+        # set up mocks
+        self.backup_platform_system = platform.system()
+        platform.system = self.mock_platform_system
+        self.backup_linux_distribution = self.envlayer.platform.linux_distribution
+        self.envlayer.platform.linux_distribution = self.mock_linux_distribution
+        
+        # Act
+        os_offer, os_version, os_name = self.envlayer.platform.extract_linux_distribution_os_info()
+        
+        # Verify
+        self.assertEqual(os_offer, 'test')
+        self.assertEqual(os_version, 'test')
+        self.assertEqual(os_name, 'test')
+        
+        # Restore mocks
+        self.envlayer.platform.linux_distribution = self.backup_linux_distribution
+        platform.system = self.backup_platform_system
+    
+    def test_extract_linux_distribution_os_info_no_data(self):
+        """ Test linux_distribution_images_details returning none. """
+        # set up mocks
+        self.backup_platform_system = platform.system()
+        platform.system = self.mock_platform_system
+        self.backup_linux_distribution = self.envlayer.platform.linux_distribution
+        self.envlayer.platform.linux_distribution = lambda: None
+        
+        # Act
+        os_offer, os_version, os_name = self.envlayer.platform.extract_linux_distribution_os_info()
+        
+        # Verify
+        self.assertEqual(os_offer, None)
+        self.assertEqual(os_version, None)
+        self.assertEqual(os_name, None)
+        
+        # Restore mocks
+        self.envlayer.platform.linux_distribution = self.backup_linux_distribution
+        platform.system = self.backup_platform_system
+        
 
 if __name__ == '__main__':
     unittest.main()

src/core/tests/Test_YumPackageManager.py

@@ -822,8 +822,8 @@ def test_apply_fix_ssl_cert_issue_non_rhel_img_failed(self):
         """ Test ssl expired cert issue throw exception on non rhel images."""
         # Set up and mocks
         self.runtime.set_legacy_test_type('SSLCertificateIssueType1SadPathAfterFix')
-        original_env_layer_platform_linux_distribution_images_details = self.runtime.env_layer.platform.linux_distribution_images_details
-        self.runtime.env_layer.platform.linux_distribution_images_details = self.mock_ubuntu_distribution
+        original_env_layer_platform_linux_distribution_images_details = self.runtime.env_layer.platform.extract_linux_distribution_os_info
+        self.runtime.env_layer.platform.extract_linux_distribution_os_info = self.mock_ubuntu_distribution
         package_manager = self.runtime.container.get('package_manager')
         self.assertIsNotNone(package_manager)
 
@@ -835,7 +835,7 @@ def test_apply_fix_ssl_cert_issue_non_rhel_img_failed(self):
         self.assertTrue('Customer environment error (expired SSL certs)' in str(context.exception))
 
         # Restore mock
-        self.runtime.env_layer.platform.linux_distribution_images_details = original_env_layer_platform_linux_distribution_images_details
+        self.runtime.env_layer.platform.extract_linux_distribution_os_info = original_env_layer_platform_linux_distribution_images_details
         self.runtime.stop()