Fix yet another config double conversion (#142)

* Fix yet another config double conversion * Fix unit test relying on radio library schema conversion * Fix it for both parametrized tests
zigpy · Aug 6, 2024 · d7a1008 · d7a1008
1 parent ad8f40b
commit d7a1008
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tests/test_gateway.py b/tests/test_gateway.py
@@ -409,7 +409,10 @@ async def test_gateway_initialize_bellows_thread(
  ) as mock_new:
  zha_gw = Gateway(zha_data)
  await zha_gw.async_initialize()
- assert mock_new.mock_calls[-1].kwargs["config"][CONF_USE_THREAD] is thread_state
+ assert (
+ mock_new.mock_calls[-1].kwargs["config"].get(CONF_USE_THREAD, True)
+ is thread_state
+ )
  await zha_gw.shutdown()
 
 

diff --git a/zha/application/gateway.py b/zha/application/gateway.py
@@ -210,7 +210,7 @@ def get_application_controller_data(self) -> tuple[ControllerApplication, dict]:
  ):
  app_config[CONF_USE_THREAD] = False
 
- return radio_type.controller, radio_type.controller.SCHEMA(app_config)
+ return radio_type.controller, app_config
 
  @classmethod
  async def async_from_config(cls, config: ZHAData) -> Self: