Add test cases

sonic-net · Dec 17, 2024 · 84d2b75 · 84d2b75
1 parent 8a82233
commit 84d2b75
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/tests/test_rfc2737.py b/tests/test_rfc2737.py
@@ -24,23 +24,21 @@ class TestPhysicalTableMIBUpdater(TestCase):
     def test_PhysicalTableMIBUpdater_exception_in_reinit_data_wont_block_reinit_iteration_first(self, mock_xcvr_reinit_data):
         updater = PhysicalTableMIBUpdater()
 
-        with (mock.patch('sonic_ax_impl.mibs.ietf.rfc2737.XcvrCacheUpdater.reinit_data') as mocked_xcvr_reinit_data,
+        with (pytest.raises(Exception) as excinfo,
+              mock.patch('sonic_ax_impl.mibs.ietf.rfc2737.XcvrCacheUpdater.reinit_data') as mocked_xcvr_reinit_data,
               mock.patch('sonic_ax_impl.mibs.ietf.rfc2737.PsuCacheUpdater.reinit_data') as mocked_psu_reinit_data,
               mock.patch('sonic_ax_impl.mibs.ietf.rfc2737.FanDrawerCacheUpdater.reinit_data') as mocked_fan_drawer_reinit_data,
               mock.patch('sonic_ax_impl.mibs.ietf.rfc2737.FanCacheUpdater.reinit_data') as mocked_fan_cache_reinit_data,
               mock.patch('sonic_ax_impl.mibs.ietf.rfc2737.ThermalCacheUpdater.reinit_data') as mocked_thermal_reinit_data,
               mock.patch('sonic_ax_impl.mibs.cancel_redis_pubsub') as mocked_cancel_redis_pubsub):
-
-            with pytest.raises(Exception) as excinfo:
-                updater.reinit_data()
-
-            assert str(excinfo.value) == "mocked error"
-            mocked_xcvr_reinit_data.assert_called()
-            mocked_psu_reinit_data.assert_called()
-            mocked_fan_drawer_reinit_data.assert_called()
-            mocked_fan_cache_reinit_data.assert_called()
-            mocked_thermal_reinit_data.assert_called()
-            mocked_cancel_redis_pubsub.assert_called()
+            updater.reinit_data()
+        assert str(excinfo.value) == "mocked error"
+        mocked_xcvr_reinit_data.assert_called()
+        mocked_psu_reinit_data.assert_called()
+        mocked_fan_drawer_reinit_data.assert_called()
+        mocked_fan_cache_reinit_data.assert_called()
+        mocked_thermal_reinit_data.assert_called()
+        mocked_cancel_redis_pubsub.assert_called()
 
     # Given: 5 physical updaters are register into reinit of PhysicalTableMIBUpdater
     # When: The last updater(ThermalCacheUpdater) raises exception in the reinit
@@ -83,13 +81,13 @@ def test_PhysicalTableMIBUpdater_runtime_exc_in_reinit_data_wont_block_reinit_it
                   'sonic_ax_impl.mibs.ietf.rfc2737.ThermalCacheUpdater.reinit_data') as mocked_thermal_reinit_data,
               mock.patch('sonic_ax_impl.mibs.cancel_redis_pubsub') as mocked_cancel_redis_pubsub):
             updater.reinit_data()
+            mocked_xcvr_reinit_data.assert_called()
+            mocked_psu_reinit_data.assert_called()
+            mocked_fan_drawer_reinit_data.assert_called()
+            mocked_fan_cache_reinit_data.assert_called()
+            mocked_thermal_reinit_data.assert_called()
+            mocked_cancel_redis_pubsub.assert_called()
         assert str(excinfo.value) == "mocked runtime error"
-        mocked_xcvr_reinit_data.assert_called()
-        mocked_psu_reinit_data.assert_called()
-        mocked_fan_drawer_reinit_data.assert_called()
-        mocked_fan_cache_reinit_data.assert_called()
-        mocked_thermal_reinit_data.assert_called()
-        mocked_cancel_redis_pubsub.assert_called()
 
     # Given: 5 physical updaters are register into reinit of PhysicalTableMIBUpdater
     # When: The last updater(XcvrCacheUpdater) raises Runtime exception in the reinit
@@ -109,13 +107,13 @@ def test_PhysicalTableMIBUpdater_runtime_exc_in_reinit_data_wont_block_reinit_it
                   'sonic_ax_impl.mibs.ietf.rfc2737.ThermalCacheUpdater.reinit_data') as mocked_thermal_reinit_data,
               mock.patch('sonic_ax_impl.mibs.cancel_redis_pubsub') as mocked_cancel_redis_pubsub):
             updater.reinit_data()
-            assert str(excinfo.value) == "mocked runtime error"
             mocked_xcvr_reinit_data.assert_called()
             mocked_psu_reinit_data.assert_called()
             mocked_fan_drawer_reinit_data.assert_called()
             mocked_fan_cache_reinit_data.assert_called()
             mocked_thermal_reinit_data.assert_called()
             mocked_cancel_redis_pubsub.assert_called()
+        assert str(excinfo.value) == "mocked runtime error"
 
     # Given: 5 physical updaters are register into reinit of PhysicalTableMIBUpdater
     # When: The first(XcvrCacheUpdater) and last updater(ThermalCacheUpdater)
@@ -134,12 +132,13 @@ def test_PhysicalTableMIBUpdater_multi_exception(self, mock_xcvr_reinit_data, mo
                   'sonic_ax_impl.mibs.ietf.rfc2737.FanDrawerCacheUpdater.reinit_data') as mocked_fan_drawer_reinit_data,
               mock.patch('sonic_ax_impl.mibs.ietf.rfc2737.FanCacheUpdater.reinit_data') as mocked_fan_cache_reinit_data,
               mock.patch(
-                  'sonic_ax_impl.mibs.ietf.rfc2737.ThermalCacheUpdater.reinit_data') as mocked_thermal_reinit_data):
+                  'sonic_ax_impl.mibs.ietf.rfc2737.ThermalCacheUpdater.reinit_data') as mocked_thermal_reinit_data,
+              mock.patch('sonic_ax_impl.mibs.cancel_redis_pubsub') as mocked_cancel_redis_pubsub):
             updater.reinit_data()
-            assert str(excinfo.value) == "mocked runtime error"
             mocked_xcvr_reinit_data.assert_called()
             mocked_psu_reinit_data.assert_called()
             mocked_fan_drawer_reinit_data.assert_called()
             mocked_fan_cache_reinit_data.assert_called()
             mocked_thermal_reinit_data.assert_called()
-            mocked_cancel_redis_pubsub.assert_called()
+            mocked_cancel_redis_pubsub.assert_called()
+        assert str(excinfo.value) == "mocked runtime error"