Fixed mocking of handler

thingsboard · Dec 5, 2024 · 4fac5bf · 4fac5bf
1 parent bc11eff
commit 4fac5bf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/tests/integration/connectors/can/test_can_connector.py b/tests/integration/connectors/can/test_can_connector.py
@@ -29,6 +29,7 @@
 from thingsboard_gateway.gateway.entities.report_strategy_config import ReportStrategyConfig
 from thingsboard_gateway.gateway.entities.telemetry_entry import TelemetryEntry
 from thingsboard_gateway.gateway.tb_gateway_service import TBGatewayService
+from thingsboard_gateway.tb_utility.tb_handler import TBRemoteLoggerHandler
 from thingsboard_gateway.tb_utility.tb_logger import TbLogger, init_logger
 
 try :
@@ -66,6 +67,8 @@ def setUp(self):
         super().setUp()
         self.bus = self._create_bus()
         self.gateway = Mock(spec=TBGatewayService)
+        self.gateway.remote_handler = Mock(spec=TBRemoteLoggerHandler)
+        self.gateway.remote_handler.level = logging.DEBUG
         self.tb_logger = Mock(spec=TbLogger)
         self.connector = None
         self.config = None
@@ -92,7 +95,7 @@ def _create_connector(self, config_file_name):
                 self.connector.open()
                 sleep(1)  # some time to init
             except Exception as e:
-                print(e)
+                raise e
 
 
 class CanConnectorPollingTests(CanConnectorTestsBase):

diff --git a/tests/integration/connectors/connector_integration_base_test.py b/tests/integration/connectors/connector_integration_base_test.py
@@ -1,4 +1,4 @@
-
+import logging
 #      Copyright 2022. ThingsBoard
 #  #
 #      Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,7 @@
 
 from thingsboard_gateway.gateway.tb_gateway_service import TBGatewayService
 from thingsboard_gateway.gateway.tb_gateway_service import DEFAULT_CONNECTORS
+from thingsboard_gateway.tb_utility.tb_handler import TBRemoteLoggerHandler
 from thingsboard_gateway.tb_utility.tb_loader import TBModuleLoader
 
 
@@ -35,6 +36,8 @@ def setUp(self):
         super().setUp()
         self.mock_logger = patch('thingsboard_gateway.tb_utility.tb_logger.TbLogger').start()
         self.gateway = Mock(spec=TBGatewayService)
+        self.gateway.remote_handler = Mock(spec=TBRemoteLoggerHandler)
+        self.gateway.remote_handler.level = logging.DEBUG
         self.gateway.log = self.mock_logger
         self.connector = None
         self.config = None

diff --git a/tests/integration/connectors/modbus/test_modbus_connector.py b/tests/integration/connectors/modbus/test_modbus_connector.py
@@ -10,6 +10,7 @@
 
 from thingsboard_gateway.connectors.modbus.entities.bytes_uplink_converter_config import BytesUplinkConverterConfig
 from thingsboard_gateway.gateway.tb_client import TBClient
+from thingsboard_gateway.tb_utility.tb_handler import TBRemoteLoggerHandler
 from thingsboard_gateway.tb_utility.tb_logger import TbLogger
 
 try:
@@ -35,6 +36,8 @@ def setUp(self) -> None:
         super().setUp()
         self.tb_client = Mock(spec=TBClient)
         self.gateway = Mock(spec=TBGatewayService)
+        self.gateway.remote_handler = Mock(spec=TBRemoteLoggerHandler)
+        self.gateway.remote_handler.level = logging.DEBUG
         self.gateway.tb_client = self.tb_client
         self.tb_logger = Mock(spec=TbLogger)
         self.gateway.get_devices.return_value = []