Fix checkers failures

Author: benle7

tests/show_platform_test.py

@@ -4,10 +4,6 @@
 import textwrap
 from unittest import mock
 
-mock_sonic_platform = mock.MagicMock()
-sys.modules['sonic_platform'] = mock_sonic_platform
-sys.modules['sonic_platform.platform'] = mock_sonic_platform.platform
-
 import pytest
 from click.testing import CliRunner
 
@@ -216,6 +212,10 @@ def test_bmc_summary_regular_output(self):
                 self.TEST_BMC_VERSION
             )
 
+        mock_sonic_platform = mock.MagicMock()
+        sys.modules['sonic_platform'] = mock_sonic_platform
+        sys.modules['sonic_platform.platform'] = mock_sonic_platform.platform
+
         mock_platform = mock.MagicMock()
         mock_chassis = mock.MagicMock()
         mock_bmc = mock.MagicMock()
@@ -224,11 +224,11 @@ def test_bmc_summary_regular_output(self):
         mock_chassis.get_bmc.return_value = mock_bmc
         mock_bmc.get_eeprom.return_value = self.TEST_BMC_EEPROM_INFO
         mock_bmc.get_version.return_value = self.TEST_BMC_VERSION
+        mock_sonic_platform.platform.Platform.return_value = mock_platform
 
-        with mock.patch('sonic_platform.platform.Platform', return_value=mock_platform):
-            result = CliRunner().invoke(show.cli.commands['platform'].commands['bmc'].commands['summary'], [])
-            assert result.exit_code == 0, result.output
-            assert result.output == textwrap.dedent(expected_output)
+        result = CliRunner().invoke(show.cli.commands['platform'].commands['bmc'].commands['summary'], [])
+        assert result.exit_code == 0, result.output
+        assert result.output == textwrap.dedent(expected_output)
 
     def test_bmc_summary_json_output(self):
         """Test 'show platform bmc summary' with JSON output"""
@@ -241,6 +241,10 @@ def test_bmc_summary_json_output(self):
             'FirmwareVersion': self.TEST_BMC_VERSION
         }
 
+        mock_sonic_platform = mock.MagicMock()
+        sys.modules['sonic_platform'] = mock_sonic_platform
+        sys.modules['sonic_platform.platform'] = mock_sonic_platform.platform
+
         mock_platform = mock.MagicMock()
         mock_chassis = mock.MagicMock()
         mock_bmc = mock.MagicMock()
@@ -249,12 +253,12 @@ def test_bmc_summary_json_output(self):
         mock_chassis.get_bmc.return_value = mock_bmc
         mock_bmc.get_eeprom.return_value = self.TEST_BMC_EEPROM_INFO
         mock_bmc.get_version.return_value = self.TEST_BMC_VERSION
+        mock_sonic_platform.platform.Platform.return_value = mock_platform
 
-        with mock.patch('sonic_platform.platform.Platform', return_value=mock_platform):
-            result = CliRunner().invoke(show.cli.commands['platform'].commands['bmc'].commands['summary'], ['--json'])
-            assert result.exit_code == 0, result.output
-            output_json = json.loads(result.output)
-            assert output_json == expected_json
+        result = CliRunner().invoke(show.cli.commands['platform'].commands['bmc'].commands['summary'], ['--json'])
+        assert result.exit_code == 0, result.output
+        output_json = json.loads(result.output)
+        assert output_json == expected_json
 
     def test_bmc_eeprom_regular_output(self):
         """Test 'show platform bmc eeprom' with regular output"""
@@ -272,18 +276,22 @@ def test_bmc_eeprom_regular_output(self):
                 self.TEST_BMC_EEPROM_INFO['SerialNumber']
             )
 
+        mock_sonic_platform = mock.MagicMock()
+        sys.modules['sonic_platform'] = mock_sonic_platform
+        sys.modules['sonic_platform.platform'] = mock_sonic_platform.platform
+
         mock_platform = mock.MagicMock()
         mock_chassis = mock.MagicMock()
         mock_bmc = mock.MagicMock()
 
         mock_platform.get_chassis.return_value = mock_chassis
         mock_chassis.get_bmc.return_value = mock_bmc
         mock_bmc.get_eeprom.return_value = self.TEST_BMC_EEPROM_INFO
+        mock_sonic_platform.platform.Platform.return_value = mock_platform
 
-        with mock.patch('sonic_platform.platform.Platform', return_value=mock_platform):
-            result = CliRunner().invoke(show.cli.commands['platform'].commands['bmc'].commands['eeprom'], [])
-            assert result.exit_code == 0, result.output
-            assert result.output == textwrap.dedent(expected_output)
+        result = CliRunner().invoke(show.cli.commands['platform'].commands['bmc'].commands['eeprom'], [])
+        assert result.exit_code == 0, result.output
+        assert result.output == textwrap.dedent(expected_output)
 
     def test_bmc_eeprom_json_output(self):
         """Test 'show platform bmc eeprom' with JSON output"""
@@ -295,16 +303,20 @@ def test_bmc_eeprom_json_output(self):
             'SerialNumber': self.TEST_BMC_EEPROM_INFO['SerialNumber']
         }
 
+        mock_sonic_platform = mock.MagicMock()
+        sys.modules['sonic_platform'] = mock_sonic_platform
+        sys.modules['sonic_platform.platform'] = mock_sonic_platform.platform
+
         mock_platform = mock.MagicMock()
         mock_chassis = mock.MagicMock()
         mock_bmc = mock.MagicMock()
 
         mock_platform.get_chassis.return_value = mock_chassis
         mock_chassis.get_bmc.return_value = mock_bmc
         mock_bmc.get_eeprom.return_value = self.TEST_BMC_EEPROM_INFO
+        mock_sonic_platform.platform.Platform.return_value = mock_platform
 
-        with mock.patch('sonic_platform.platform.Platform', return_value=mock_platform):
-            result = CliRunner().invoke(show.cli.commands['platform'].commands['bmc'].commands['eeprom'], ['--json'])
-            assert result.exit_code == 0, result.output
-            output_json = json.loads(result.output)
-            assert output_json == expected_json
+        result = CliRunner().invoke(show.cli.commands['platform'].commands['bmc'].commands['eeprom'], ['--json'])
+        assert result.exit_code == 0, result.output
+        output_json = json.loads(result.output)
+        assert output_json == expected_json