Merge pull request #2250 from SmartThingsCommunity/staged_release/health_check

greens · web-flow · commit 0d2ce3780e3a · 2025-07-14T08:53:13.000-07:00
Roll back health check changes for staged release.
diff --git a/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/init.lua b/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/init.lua
@@ -24,8 +24,7 @@ local zigbee_carbon_monoxide_driver_template = {
         capabilities.battery,
     },
     ias_zone_configuration_method = constants.IAS_ZONE_CONFIGURE_TYPE.AUTO_ENROLL_RESPONSE,
-    sub_drivers = { require("ClimaxTechnology") },
-    health_check = false,
+    sub_drivers = { require("ClimaxTechnology") }
 }
 
 defaults.register_for_default_handlers(zigbee_carbon_monoxide_driver_template,
diff --git a/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_climax_technology_carbon_monoxide.lua b/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_climax_technology_carbon_monoxide.lua
@@ -34,7 +34,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device)end
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 test.set_test_init_function(test_init)
 
 test.register_message_test(
diff --git a/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_zigbee_carbon_monoxide.lua b/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_zigbee_carbon_monoxide.lua
@@ -29,7 +29,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device)end
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 test.set_test_init_function(test_init)
 
 test.register_message_test(
diff --git a/drivers/SmartThings/zigbee-fan/src/init.lua b/drivers/SmartThings/zigbee-fan/src/init.lua
@@ -38,8 +38,7 @@ local zigbee_fan_driver = {
   },
   lifecycle_handlers = {
     init = device_init
-  },
-  health_check = false,
+  }
 }
 
 defaults.register_for_default_handlers(zigbee_fan_driver,zigbee_fan_driver.supported_capabilities)
diff --git a/drivers/SmartThings/zigbee-fan/src/test/test_fan_light.lua b/drivers/SmartThings/zigbee-fan/src/test/test_fan_light.lua
@@ -39,7 +39,9 @@ local mock_base_device = test.mock_device.build_test_zigbee_device(
 zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
-    test.mock_device.add_test_device(mock_base_device)end
+    test.mock_device.add_test_device(mock_base_device)
+    zigbee_test_utils.init_noop_health_check_timer()
+end
 test.set_test_init_function(test_init)
 
 -- create test commands
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/init.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/init.lua
@@ -86,8 +86,7 @@ local zigbee_humidity_driver = {
     require("centralite-sensor"),
     require("heiman-sensor"),
     require("frient-sensor")
-  },
-  health_check = false,
+  }
 }
 
 defaults.register_for_default_handlers(zigbee_humidity_driver, zigbee_humidity_driver.supported_capabilities)
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_battery_sensor.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_battery_sensor.lua
@@ -37,7 +37,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device)end
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/SmartThings/zigbee-illuminance-sensor/src/init.lua b/drivers/SmartThings/zigbee-illuminance-sensor/src/init.lua
@@ -23,8 +23,7 @@ local zigbee_illuminance_driver = {
   },
   sub_drivers = {
     require("aqara")
-  },
-  health_check = false,
+  }
 }
 
 defaults.register_for_default_handlers(zigbee_illuminance_driver, zigbee_illuminance_driver.supported_capabilities)
diff --git a/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor.lua b/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor.lua
@@ -35,7 +35,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device)end
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor_aqara.lua b/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor_aqara.lua
@@ -49,7 +49,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device)end
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/SmartThings/zigbee-power-meter/src/init.lua b/drivers/SmartThings/zigbee-power-meter/src/init.lua
@@ -57,8 +57,7 @@ local zigbee_power_meter_driver_template = {
   lifecycle_handlers = {
     init = device_init,
     doConfigure = do_configure,
-  },
-  health_check = false,
+  }
 }
 
 defaults.register_for_default_handlers(zigbee_power_meter_driver_template, zigbee_power_meter_driver_template.supported_capabilities)
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter.lua
@@ -27,7 +27,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device)end
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report.lua
@@ -36,7 +36,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device)end
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report_sihas.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report_sihas.lua
@@ -36,7 +36,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device)end
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/SmartThings/zigbee-presence-sensor/src/init.lua b/drivers/SmartThings/zigbee-presence-sensor/src/init.lua
@@ -202,8 +202,7 @@ local zigbee_presence_driver = {
   sub_drivers = {
     require("aqara"),
     require("arrival-sensor-v1")
-  },
-  health_check = false,
+  }
 }
 
 defaults.register_for_default_handlers(zigbee_presence_driver, zigbee_presence_driver.supported_capabilities)
diff --git a/drivers/SmartThings/zigbee-presence-sensor/src/test/test_st_arrival_sensor_v1.lua b/drivers/SmartThings/zigbee-presence-sensor/src/test/test_st_arrival_sensor_v1.lua
@@ -76,7 +76,9 @@ local add_device = function()
 end
 
 local function test_init()
-  test.mock_device.add_test_device(mock_simple_device)end
+  test.mock_device.add_test_device(mock_simple_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 
@@ -191,7 +193,9 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send( mock_simple_device:generate_test_message("main", capabilities.presenceSensor.presence("not present")) )
     end,
     {
-      test_init = function()      end
+      test_init = function()
+        zigbee_test_utils.init_noop_health_check_timer()
+      end
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-presence-sensor/src/test/test_zigbee_presence_sensor.lua b/drivers/SmartThings/zigbee-presence-sensor/src/test/test_zigbee_presence_sensor.lua
@@ -46,7 +46,9 @@ local mock_simple_device = test.mock_device.build_test_zigbee_device(
 zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
-  test.mock_device.add_test_device(mock_simple_device)end
+  test.mock_device.add_test_device(mock_simple_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 local function build_config_response_msg(cluster, status)
   local addr_header = messages.AddressHeader(
@@ -199,7 +201,9 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send( mock_simple_device:generate_test_message("main", capabilities.presenceSensor.presence("not present")) )
     end,
     {
-      test_init = function()      end
+      test_init = function()
+        zigbee_test_utils.init_noop_health_check_timer()
+      end
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-range-extender/src/init.lua b/drivers/SmartThings/zigbee-range-extender/src/init.lua
@@ -30,7 +30,6 @@ local zigbee_range_driver_template = {
       [capabilities.refresh.commands.refresh.NAME] = do_refresh,
     }
   },
-  health_check = false,
 }
 
 local zigbee_range_extender_driver = ZigbeeDriver("zigbee-range-extender", zigbee_range_driver_template)
diff --git a/drivers/SmartThings/zigbee-range-extender/src/test/test_zigbee_extend.lua b/drivers/SmartThings/zigbee-range-extender/src/test/test_zigbee_extend.lua
@@ -14,6 +14,7 @@
 
 -- Mock out globals
 local test = require "integration_test"
+local zigbee_test_utils = require "integration_test.zigbee_test_utils"
 local clusters = require "st.zigbee.zcl.clusters"
 local t_utils = require "integration_test.utils"
 local Basic = clusters.Basic
@@ -23,7 +24,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 )
 
 local function test_init()
-  test.mock_device.add_test_device(mock_device)  test.timer.__create_and_queue_test_time_advance_timer(600, "interval", "health_check")
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+  test.timer.__create_and_queue_test_time_advance_timer(600, "interval", "health_check")
 end
 
 test.set_test_init_function(test_init)
@@ -42,17 +45,17 @@ test.register_coroutine_test(
     end
 )
 
--- test.register_coroutine_test(
---     "Health check should check all relevant attributes",
---     function()
---       test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
---       test.wait_for_events()
-
---       test.mock_time.advance_time(50000)
---       test.socket.zigbee:__set_channel_ordering("relaxed")
---       test.socket.zigbee:__expect_send({ mock_device.id, Basic.attributes.ZCLVersion:read(mock_device) })
---       test.wait_for_events()
---     end
--- )
+test.register_coroutine_test(
+    "Health check should check all relevant attributes",
+    function()
+      test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
+      test.wait_for_events()
+
+      test.mock_time.advance_time(50000)
+      test.socket.zigbee:__set_channel_ordering("relaxed")
+      test.socket.zigbee:__expect_send({ mock_device.id, Basic.attributes.ZCLVersion:read(mock_device) })
+      test.wait_for_events()
+    end
+)
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zigbee-siren/src/init.lua b/drivers/SmartThings/zigbee-siren/src/init.lua
@@ -200,8 +200,7 @@ local zigbee_siren_driver_template = {
         data_type = IASZone.attributes.ZoneStatus.base_type
       }
     }
-  },
-  health_check = false,
+  }
 }
 
 defaults.register_for_default_handlers(zigbee_siren_driver_template, zigbee_siren_driver_template.supported_capabilities)
diff --git a/drivers/SmartThings/zigbee-siren/src/test/test_frient_siren.lua b/drivers/SmartThings/zigbee-siren/src/test/test_frient_siren.lua
@@ -37,7 +37,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device)end
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/SmartThings/zigbee-siren/src/test/test_ozom_siren.lua b/drivers/SmartThings/zigbee-siren/src/test/test_ozom_siren.lua
@@ -38,7 +38,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device)end
+  test.mock_device.add_test_device(mock_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 
diff --git a/drivers/SmartThings/zigbee-watering-kit/src/init.lua b/drivers/SmartThings/zigbee-watering-kit/src/init.lua
@@ -13,7 +13,6 @@ local zigbee_water_driver_template = {
   sub_drivers = {
     require("thirdreality")
   },
-  health_check = false,
 }
 
 defaults.register_for_default_handlers(zigbee_water_driver_template, zigbee_water_driver_template.supported_capabilities)

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,7 @@ local zigbee_carbon_monoxide_driver_template = {`
`24`	`24`	`capabilities.battery,`
`25`	`25`	`},`
`26`	`26`	`ias_zone_configuration_method = constants.IAS_ZONE_CONFIGURE_TYPE.AUTO_ENROLL_RESPONSE,`
`27`		`- sub_drivers = { require("ClimaxTechnology") },`
`28`		`- health_check = false,`
	`27`	`+ sub_drivers = { require("ClimaxTechnology") }`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`defaults.register_for_default_handlers(zigbee_carbon_monoxide_driver_template,`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ local zigbee_fan_driver = {`
`38`	`38`	`},`
`39`	`39`	`lifecycle_handlers = {`
`40`	`40`	`init = device_init`
`41`		`- },`
`42`		`- health_check = false,`
	`41`	`+ }`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`defaults.register_for_default_handlers(zigbee_fan_driver,zigbee_fan_driver.supported_capabilities)`
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,7 @@ local zigbee_humidity_driver = {`
`86`	`86`	`require("centralite-sensor"),`
`87`	`87`	`require("heiman-sensor"),`
`88`	`88`	`require("frient-sensor")`
`89`		`- },`
`90`		`- health_check = false,`
	`89`	`+ }`
`91`	`90`	`}`
`92`	`91`
`93`	`92`	`defaults.register_for_default_handlers(zigbee_humidity_driver, zigbee_humidity_driver.supported_capabilities)`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ local zigbee_illuminance_driver = {`
`23`	`23`	`},`
`24`	`24`	`sub_drivers = {`
`25`	`25`	`require("aqara")`
`26`		`- },`
`27`		`- health_check = false,`
	`26`	`+ }`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`defaults.register_for_default_handlers(zigbee_illuminance_driver, zigbee_illuminance_driver.supported_capabilities)`