File tree Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -118,14 +118,14 @@ def test_extract_linux_distribution_os_info_no_data(self):
118
118
os_offer , os_version , os_name = self .envlayer .platform .extract_linux_distribution_os_info ()
119
119
120
120
# 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 )
124
124
125
125
# Restore mocks
126
126
self .envlayer .platform .linux_distribution = self .backup_linux_distribution
127
127
platform .system = self .backup_platform_system
128
128
129
129
130
130
if __name__ == '__main__' :
131
- unittest .main ()
131
+ unittest .main ()
Original file line number Diff line number Diff line change @@ -680,8 +680,8 @@ def test_obsolete_packages_should_not_considered_in_available_updates(self):
680
680
def test_rhel7_image_with_security_plugin (self ):
681
681
"""Unit test for yum package manager rhel images below 8 and Classification = Security"""
682
682
# 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
685
685
686
686
self .__assert_test_rhel8_image ()
687
687
@@ -691,8 +691,8 @@ def test_rhel7_image_with_security_plugin(self):
691
691
def test_rhel8_image_higher_no_security_plugin (self ):
692
692
"""Unit test for yum package manager rhel images >= 8 and Classification = Security"""
693
693
# 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
696
696
697
697
self .__assert_test_rhel8_image ()
698
698
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ class LegacyPlatform(object):
28
28
def linux_distribution (self ):
29
29
return ['Ubuntu' , '16.04' , 'Xenial' ]
30
30
31
- def linux_distribution_images_details (self ):
31
+ def extract_linux_distribution_os_info (self ):
32
32
return ['Red Hat Enterprise Linux Server' , '7' , 'Maipo' ]
33
33
34
34
@staticmethod
You can’t perform that action at this time.
0 commit comments