Dev 0.11 (#175)

* use random IP adresses for unit tests

* Docker: The description ist missing (#171)

Fixes #167

* S allius/issue167 (#172)

* cleanup

* Sonar qube 6 (#174)

* test class ModbusConn

app/src/async_stream.py

@@ -3,10 +3,15 @@ import logging
 import traceback
 import time
 from asyncio import StreamReader, StreamWriter
-from messages import hex_dump_memory, State
 from typing import Self
 from itertools import count
 
+if __name__ == "app.src.async_stream":
+    from app.src.messages import hex_dump_memory, State
+else:  # pragma: no cover
+    from messages import hex_dump_memory, State
+
+
 import gc
 logger = logging.getLogger('conn')
 

app/src/gen3plus/connection_g3p.py

@@ -1,7 +1,12 @@
 import logging
 from asyncio import StreamReader, StreamWriter
-from async_stream import AsyncStream
-from gen3plus.solarman_v5 import SolarmanV5
+
+if __name__ == "app.src.gen3plus.connection_g3p":
+    from app.src.async_stream import AsyncStream
+    from app.src.gen3plus.solarman_v5 import SolarmanV5
+else:  # pragma: no cover
+    from async_stream import AsyncStream
+    from gen3plus.solarman_v5 import SolarmanV5
 
 logger = logging.getLogger('conn')
 

app/src/gen3plus/inverter_g3p.py

@@ -3,11 +3,18 @@ import traceback
 import json
 import asyncio
 from asyncio import StreamReader, StreamWriter
-from config import Config
-from inverter import Inverter
-from gen3plus.connection_g3p import ConnectionG3P
 from aiomqtt import MqttCodeError
-from infos import Infos
+
+if __name__ == "app.src.gen3plus.inverter_g3p":
+    from app.src.config import Config
+    from app.src.inverter import Inverter
+    from app.src.gen3plus.connection_g3p import ConnectionG3P
+    from app.src.infos import Infos
+else:  # pragma: no cover
+    from config import Config
+    from inverter import Inverter
+    from gen3plus.connection_g3p import ConnectionG3P
+    from infos import Infos
 
 
 logger_mqtt = logging.getLogger('mqtt')

app/src/gen3plus/solarman_v5.py

@@ -172,7 +172,7 @@ class SolarmanV5(Message):
         self.db.set_db_def_value(Register.POLLING_INTERVAL,
                                  self.mb_timeout)
         self.db.set_db_def_value(Register.HEARTBEAT_INTERVAL,
-                                 120)  # fixme
+                                 120)
         self.new_data['controller'] = True
 
         self.state = State.up

app/src/inverter.py

@@ -1,11 +1,15 @@
 import asyncio
 import logging
 import json
-from config import Config
-from mqtt import Mqtt
-from infos import Infos
+if __name__ == "app.src.inverter":
+    from app.src.config import Config
+    from app.src.mqtt import Mqtt
+    from app.src.infos import Infos
+else:  # pragma: no cover
+    from config import Config
+    from mqtt import Mqtt
+    from infos import Infos
 
-# logger = logging.getLogger('conn')
 logger_mqtt = logging.getLogger('mqtt')
 
 
@@ -72,7 +76,7 @@ class Inverter():
             Infos.new_stat_data[key] = False
 
     @classmethod
-    def class_close(cls, loop) -> None:
+    def class_close(cls, loop) -> None:   # pragma: no cover
         logging.debug('Inverter.class_close')
         logging.info('Close MQTT Task')
         loop.run_until_complete(cls.mqtt.close())

app/src/modbus_tcp.py

@@ -1,9 +1,13 @@
 import logging
 import traceback
 import asyncio
-from config import Config
 
-from gen3plus.inverter_g3p import InverterG3P
+if __name__ == "app.src.modbus_tcp":
+    from app.src.config import Config
+    from app.src.gen3plus.inverter_g3p import InverterG3P
+else:  # pragma: no cover
+    from config import Config
+    from gen3plus.inverter_g3p import InverterG3P
 
 logger = logging.getLogger('conn')