Skip to content

Commit b488dfc

Browse files
committed
update files with extract_linux_distribution_os_info
1 parent ddc3555 commit b488dfc

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/core/tests/Test_EnvLayer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ def test_extract_linux_distribution_os_info_no_data(self):
118118
os_offer, os_version, os_name = self.envlayer.platform.extract_linux_distribution_os_info()
119119

120120
# Verify
121-
self.assertEqual(os_offer, None)
122-
self.assertEqual(os_version, None)
123-
self.assertEqual(os_name, None)
121+
self.assertIsNone(os_offer, None)
122+
self.assertIsNone(os_version, None)
123+
self.assertIsNone(os_name, None)
124124

125125
# Restore mocks
126126
self.envlayer.platform.linux_distribution = self.backup_linux_distribution
127127
platform.system = self.backup_platform_system
128128

129129

130130
if __name__ == '__main__':
131-
unittest.main()
131+
unittest.main()

src/core/tests/Test_YumPackageManager.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -680,8 +680,8 @@ def test_obsolete_packages_should_not_considered_in_available_updates(self):
680680
def test_rhel7_image_with_security_plugin(self):
681681
"""Unit test for yum package manager rhel images below 8 and Classification = Security"""
682682
# mock linux_distribution
683-
backup_envlayer_platform_linux_distribution = LegacyEnvLayerExtensions.LegacyPlatform.linux_distribution_images_details
684-
LegacyEnvLayerExtensions.LegacyPlatform.linux_distribution_images_details = self.mock_linux7_distribution_to_return_redhat
683+
backup_envlayer_platform_linux_distribution = LegacyEnvLayerExtensions.LegacyPlatform.extract_linux_distribution_os_info
684+
LegacyEnvLayerExtensions.LegacyPlatform.extract_linux_distribution_os_info = self.mock_linux7_distribution_to_return_redhat
685685

686686
self.__assert_test_rhel8_image()
687687

@@ -691,8 +691,8 @@ def test_rhel7_image_with_security_plugin(self):
691691
def test_rhel8_image_higher_no_security_plugin(self):
692692
"""Unit test for yum package manager rhel images >= 8 and Classification = Security"""
693693
# mock linux_distribution
694-
backup_envlayer_platform_linux_distribution = LegacyEnvLayerExtensions.LegacyPlatform.linux_distribution_images_details
695-
LegacyEnvLayerExtensions.LegacyPlatform.linux_distribution_images_details = self.mock_linux8_distribution_to_return_redhat
694+
backup_envlayer_platform_linux_distribution = LegacyEnvLayerExtensions.LegacyPlatform.extract_linux_distribution_os_info
695+
LegacyEnvLayerExtensions.LegacyPlatform.extract_linux_distribution_os_info = self.mock_linux8_distribution_to_return_redhat
696696

697697
self.__assert_test_rhel8_image()
698698

src/core/tests/library/LegacyEnvLayerExtensions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class LegacyPlatform(object):
2828
def linux_distribution(self):
2929
return ['Ubuntu', '16.04', 'Xenial']
3030

31-
def linux_distribution_images_details(self):
31+
def extract_linux_distribution_os_info(self):
3232
return ['Red Hat Enterprise Linux Server', '7', 'Maipo']
3333

3434
@staticmethod

0 commit comments

Comments
 (0)