adjust tests

dali2mqtt/config.py

@@ -3,7 +3,7 @@
 
 import voluptuous as vol
 import yaml
-from consts import (
+from dali2mqtt.consts import (
     ALL_SUPPORTED_LOG_LEVELS,
     CONF_CONFIG,
     CONF_DALI_DRIVER,

dali2mqtt/dali2mqtt.py

@@ -8,10 +8,17 @@
 import time
 import os
 
+import paho.mqtt.client as mqtt
+
 import dali.address as address
 import dali.gear.general as gear
-import paho.mqtt.client as mqtt
-from consts import (
+from dali.command import YesNoResponse
+from dali.exceptions import DALIError
+
+from dali2mqtt.devicesnamesconfig import DevicesNamesConfig
+from dali2mqtt.lamp import Lamp
+from dali2mqtt.config import Config
+from dali2mqtt.consts import (
     ALL_SUPPORTED_LOG_LEVELS,
     CONF_CONFIG,
     CONF_DALI_DRIVER,
@@ -54,12 +61,7 @@
     TRIDONIC,
     YELLOW_COLOR,
 )
-from dali.command import YesNoResponse
-from dali.exceptions import DALIError
-from devicesnamesconfig import DevicesNamesConfig
 
-from lamp import Lamp
-from config import Config
 
 logging.basicConfig(format=LOG_FORMAT, level=os.environ.get("LOGLEVEL", "INFO"))
 logger = logging.getLogger(__name__)

dali2mqtt/devicesnamesconfig.py

@@ -2,7 +2,7 @@
 import logging
 
 import yaml
-from consts import ALL_SUPPORTED_LOG_LEVELS, LOG_FORMAT
+from dali2mqtt.consts import ALL_SUPPORTED_LOG_LEVELS, LOG_FORMAT
 
 logging.basicConfig(format=LOG_FORMAT)
 logger = logging.getLogger(__name__)

dali2mqtt/lamp.py

@@ -3,7 +3,7 @@
 import logging
 
 import dali.gear.general as gear
-from consts import (
+from dali2mqtt.consts import (
     ALL_SUPPORTED_LOG_LEVELS,
     LOG_FORMAT,
     MQTT_AVAILABLE,

tests/test_hasseb.py

@@ -1,10 +1,10 @@
 """Tests based on hasseb driver."""
 
-from dali_mqtt_daemon import main
+from dali2mqtt.dali2mqtt import main
 from unittest import mock
 import pytest
 
-from consts import (
+from dali2mqtt.consts import (
     DEFAULT_CONFIG_FILE,
     DEFAULT_MQTT_SERVER,
     DEFAULT_MQTT_PORT,
@@ -68,7 +68,7 @@ def loop_forever():
 def test_main(args, config, fake_mqttc, caplog):
     """Test main loop."""
     with mock.patch(
-        "dali_mqtt_daemon.create_mqtt_client", return_value=fake_mqttc
+        "dali2mqtt.dali2mqtt.create_mqtt_client", return_value=fake_mqttc
     ) as mock_mqtt_client:
         with mock.patch("time.sleep", return_value=None) as sleep:
             main(args)

tests/test_lamp.py

@@ -1,7 +1,7 @@
 """Tests for lamp."""
 
-from lamp import Lamp
-from consts import __version__
+from dali2mqtt.lamp import Lamp
+from dali2mqtt.consts import __version__
 from unittest import mock
 from dali.address import Short
 import pytest