S allius/issue217 2 (#230)

* add some reader classes to get the configuration

* adapt unittests

* get config from json or toml file

* loop over all config readers to get the configuration

* rename config test files

* use relative paths for coverage test in vscode

* do not throw an error for missing config files

* remove obsolete tests

* use dotted key notation for pv sub dictonary

* log config reading progress

* remove create_config_toml.py

* remove obsolete tests for the ha_addon

* disable mosquitto tests if the server is down

* ignore main method for test coverage

* increase test coverage

* pytest-cov: use relative_files only on github, so coverage will work with vscode locally

* remove unneeded imports

* add missing test cases

* disable branch coverage, cause its not reachable

app/tests/test_mqtt.py

@@ -12,6 +12,8 @@ from modbus import Modbus
 from gen3plus.solarman_v5 import SolarmanV5
 from cnf.config import Config
 
+NO_MOSQUITTO_TEST = False
+'''disable all tests with connections to test.mosquitto.org'''
 
 pytest_plugins = ('pytest_asyncio',)
 
@@ -69,8 +71,12 @@ def spy_modbus_cmd_client():
 
 def test_native_client(test_hostname, test_port):
     """Sanity check: Make sure the paho-mqtt client can connect to the test
-    MQTT server.
+    MQTT server. Otherwise the test set NO_MOSQUITTO_TEST to True and disable
+    all test cases which depends on the test.mosquitto.org server
     """
+    global NO_MOSQUITTO_TEST
+    if NO_MOSQUITTO_TEST:
+        pytest.skip('skipping, since Mosquitto is not reliable at the moment')
 
     import paho.mqtt.client as mqtt
     import threading
@@ -82,10 +88,62 @@ def test_native_client(test_hostname, test_port):
         on_connect = threading.Event()
         c.on_connect = Mock(side_effect=lambda *_: on_connect.set())
         c.connect_async(test_hostname, test_port)
-        assert on_connect.wait(10)
+        if not on_connect.wait(3):
+            NO_MOSQUITTO_TEST = True  # skip all mosquitto tests
+            pytest.skip('skipping, since Mosquitto is not reliable at the moment')
     finally:
         c.loop_stop()
 
+@pytest.mark.asyncio
+async def test_mqtt_connection(config_mqtt_conn):
+    global NO_MOSQUITTO_TEST
+    if NO_MOSQUITTO_TEST:
+        pytest.skip('skipping, since Mosquitto is not reliable at the moment')
+
+    _ = config_mqtt_conn
+    assert asyncio.get_running_loop()
+
+    on_connect =  asyncio.Event()
+    async def cb():
+        on_connect.set()
+
+    try:
+        m = Mqtt(cb)
+        assert m.task
+        assert await asyncio.wait_for(on_connect.wait(), 5)
+        # await asyncio.sleep(1)
+        assert 0 == m.ha_restarts
+        await m.publish('homeassistant/status', 'online')
+    except TimeoutError:
+        assert False
+    finally:
+        await m.close()
+        await m.publish('homeassistant/status', 'online')
+
+@pytest.mark.asyncio
+async def test_ha_reconnect(config_mqtt_conn):
+    global NO_MOSQUITTO_TEST
+    if NO_MOSQUITTO_TEST:
+        pytest.skip('skipping, since Mosquitto is not reliable at the moment')
+
+    _ = config_mqtt_conn
+    on_connect =  asyncio.Event()
+    async def cb():
+        on_connect.set()
+
+    try:
+        m = Mqtt(cb)
+        msg = aiomqtt.Message(topic= 'homeassistant/status', payload= b'offline', qos= 0, retain = False, mid= 0, properties= None)
+        await m.dispatch_msg(msg)
+        assert not on_connect.is_set()
+
+        msg = aiomqtt.Message(topic= 'homeassistant/status', payload= b'online', qos= 0, retain = False, mid= 0, properties= None)
+        await m.dispatch_msg(msg)
+        assert on_connect.is_set()
+
+    finally:
+        await m.close()
+
 @pytest.mark.asyncio
 async def test_mqtt_no_config(config_no_conn):
     _ = config_no_conn
@@ -110,29 +168,6 @@ async def test_mqtt_no_config(config_no_conn):
     finally:
         await m.close()
 
-@pytest.mark.asyncio
-async def test_mqtt_connection(config_mqtt_conn):
-    _ = config_mqtt_conn
-    assert asyncio.get_running_loop()
-
-    on_connect =  asyncio.Event()
-    async def cb():
-        on_connect.set()
-
-    try:
-        m = Mqtt(cb)
-        assert m.task
-        assert await asyncio.wait_for(on_connect.wait(), 5)
-        # await asyncio.sleep(1)
-        assert 0 == m.ha_restarts
-        await m.publish('homeassistant/status', 'online')
-    except TimeoutError:
-        assert False
-    finally:
-        await m.close()
-        await m.publish('homeassistant/status', 'online')
-
-
 @pytest.mark.asyncio
 async def test_msg_dispatch(config_mqtt_conn, spy_modbus_cmd):
     _ = config_mqtt_conn
@@ -209,26 +244,6 @@ async def test_msg_ignore_client_conn(config_mqtt_conn, spy_modbus_cmd_client):
     finally:
         await m.close()
 
-@pytest.mark.asyncio
-async def test_ha_reconnect(config_mqtt_conn):
-    _ = config_mqtt_conn
-    on_connect =  asyncio.Event()
-    async def cb():
-        on_connect.set()
-
-    try:
-        m = Mqtt(cb)
-        msg = aiomqtt.Message(topic= 'homeassistant/status', payload= b'offline', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        assert not on_connect.is_set()
-
-        msg = aiomqtt.Message(topic= 'homeassistant/status', payload= b'online', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        assert on_connect.is_set()
-
-    finally:
-        await m.close()
-
 @pytest.mark.asyncio
 async def test_ignore_unknown_func(config_mqtt_conn):
     '''don't dispatch for unknwon function names'''