Fix test_updater_thermal_check_min_max() (sonic-net#121)

bratashX · web-flow · commit f6e5e5902e4b · 2020-11-19T17:57:44.000-08:00
Fixes the following crash introduced by sonic-net/sonic-platform-daemons#102: ``` 01:33:00 ______________________ test_updater_thermal_check_min_max ______________________ 01:33:00 01:33:00 def test_updater_thermal_check_min_max(): 01:33:00 chassis = MockChassis() 01:33:00 01:33:00 thermal = MockThermal() 01:33:00 chassis.get_all_thermals().append(thermal) 01:33:00 01:33:00 chassis.set_modular_chassis(True) 01:33:00 chassis.set_my_slot(1) 01:33:00 temperature_updater = TemperatureUpdater(SYSLOG_IDENTIFIER, chassis) 01:33:00 01:33:00 temperature_updater.update() 01:33:00 slot_dict = temperature_updater.chassis_table.get('Thermal 1') 01:33:00 > assert slot_dict['minimum_temperature'] == str(thermal.get_minimum_recorded()) 01:33:00 E TypeError: 'NoneType' object has no attribute '__getitem__' 01:33:00 01:33:00 tests/test_thermalctld.py:341: TypeError ``` Signed-off-by: Petro Bratash <petrox.bratash@intel.com> Signed-off-by: Petro Bratash <petrox.bratash@intel.com>
diff --git a/sonic-thermalctld/tests/mock_platform.py b/sonic-thermalctld/tests/mock_platform.py
@@ -112,17 +112,18 @@ def set_status_led(self, value):
 
 
 class MockThermal(MockDevice):
-    def __init__(self):
+    def __init__(self, index = None):
         MockDevice.__init__(self)
         self.name = None
+        self.name = 'Thermal {}'.format(index) if index != None else None
         self.temperature = 2
         self.minimum_temperature = 1
         self.maximum_temperature = 5
         self.high_threshold = 3
         self.low_threshold = 1
         self.high_critical_threshold = 4
         self.low_critical_threshold = 0
-    
+
     def get_name(self):
         return self.name
 
diff --git a/sonic-thermalctld/tests/test_thermalctld.py b/sonic-thermalctld/tests/test_thermalctld.py
@@ -329,14 +329,14 @@ def test_updater_thermal_check_chassis_table():
 def test_updater_thermal_check_min_max():
     chassis = MockChassis()
 
-    thermal = MockThermal()
+    thermal = MockThermal(1)
     chassis.get_all_thermals().append(thermal)
 
     chassis.set_modular_chassis(True)
     chassis.set_my_slot(1)
     temperature_updater = TemperatureUpdater(SYSLOG_IDENTIFIER, chassis)
 
     temperature_updater.update()
-    slot_dict = temperature_updater.chassis_table.get('Thermal 1')
+    slot_dict = temperature_updater.chassis_table.get(thermal.get_name())
     assert slot_dict['minimum_temperature'] == str(thermal.get_minimum_recorded())
     assert slot_dict['maximum_temperature'] == str(thermal.get_maximum_recorded())
