bumper/confserver.py

@@ -1105,9 +1105,6 @@ class ConfServer:
             confserverlog.exception("{}".format(e))
 
     async def handle_lg_log(self, request):  # EcoVacs Home
-        if (
-            not bumper.mqtt_helperbot.Client._handler.writer is None
-        ):  # Ignore if the Helperbot writer is none
             try:
                 json_body = json.loads(await request.text())
 
@@ -1187,9 +1184,6 @@ class ConfServer:
                 confserverlog.exception("{}".format(e))
 
     async def handle_devmanager_botcommand(self, request):
-        if (
-            not bumper.mqtt_helperbot.Client._handler.writer is None
-        ):  # Ignore if the helperbot object isn't set
             try:
                 json_body = json.loads(await request.text())
 

tests/test_confserver.py

@@ -12,11 +12,11 @@ from aiohttp import web
 
 
 def create_confserver():
-    return bumper.ConfServer("127.0.0.1:11111", False, mock.MagicMock)
+    return bumper.ConfServer("127.0.0.1:11111", False)
 
 
 def create_app(loop):
-    confserver = bumper.ConfServer("127.0.0.1:11111", False, mock.MagicMock)
+    confserver = bumper.ConfServer("127.0.0.1:11111", False)
     confserver.confserver_app()
     return confserver.app
 
@@ -33,13 +33,13 @@ def remove_existing_db():
 
 
 async def test_confserver_ssl():
-    conf_server = bumper.ConfServer(("127.0.0.1", 111111), usessl=True, helperbot=None)
+    conf_server = bumper.ConfServer(("127.0.0.1", 111111), usessl=True)
     conf_server.confserver_app()
     asyncio.create_task(conf_server.start_server())
 
 
 async def test_confserver_no_ssl():
-    conf_server = bumper.ConfServer(("127.0.0.1", 111111), usessl=False, helperbot=None)
+    conf_server = bumper.ConfServer(("127.0.0.1", 111111), usessl=False)
     conf_server.confserver_app()
     asyncio.create_task(conf_server.start_server())
 
@@ -710,6 +710,7 @@ async def test_lg_logs(aiohttp_client):
     bumper.bot_set_mqtt("did_1234", True)
     confserver = create_confserver()
     client = await aiohttp_client(create_app)
+    bumper.mqtt_helperbot = bumper.mqttserver.MQTTHelperBot("127.0.0.1")
 
     # Test return get status
     command_getstatus_resp = {
@@ -717,7 +718,7 @@ async def test_lg_logs(aiohttp_client):
         "resp": "<ctl ret='ok' status='idle'/>",
         "ret": "ok",
     }
-    confserver.helperbot.send_command = mock.MagicMock(
+    bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_getstatus_resp)
     )
 
@@ -768,6 +769,7 @@ async def test_devmgr(aiohttp_client):
     bumper.db = "tests/tmp.db"  # Set db location for testing
     confserver = create_confserver()
     client = await aiohttp_client(create_app)
+    bumper.mqtt_helperbot = bumper.mqttserver.MQTTHelperBot("127.0.0.1")
 
     # Test PollSCResult
     postbody = {"td": "PollSCResult"}
@@ -797,7 +799,7 @@ async def test_devmgr(aiohttp_client):
         "resp": "<ctl ret='ok' status='idle'/>",
         "ret": "ok",
     }
-    confserver.helperbot.send_command = mock.MagicMock(
+    bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_getstatus_resp)
     )
     resp = await client.post("/api/iot/devmanager.do", json=postbody)
@@ -808,7 +810,7 @@ async def test_devmgr(aiohttp_client):
 
     # Test return fail timeout
     command_timeout_resp = {"id": "resp_1234", "errno": "timeout", "ret": "fail"}
-    confserver.helperbot.send_command = mock.MagicMock(
+    bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_timeout_resp)
     )
     resp = await client.post("/api/iot/devmanager.do", json=postbody)
@@ -817,23 +819,13 @@ async def test_devmgr(aiohttp_client):
     test_resp = json.loads(text)
     assert test_resp["ret"] == "fail"
 
-    # Set bot not on mqtt
-    bumper.bot_set_mqtt("did_1234", False)
-    confserver.helperbot.send_command = mock.MagicMock(
-        return_value=async_return(command_getstatus_resp)
-    )
-    resp = await client.post("/api/iot/devmanager.do", json=postbody)
-    assert resp.status == 200
-    text = await resp.text()
-    test_resp = json.loads(text)
-    assert test_resp["ret"] == "fail"
-
 
 async def test_dim_devmanager(aiohttp_client):
     remove_existing_db()
     bumper.db = "tests/tmp.db"  # Set db location for testing
     confserver = create_confserver()
     client = await aiohttp_client(create_app)
+    bumper.mqtt_helperbot = bumper.mqttserver.MQTTHelperBot("127.0.0.1")
 
     # Test PollSCResult
     postbody = {"td": "PollSCResult"}
@@ -863,7 +855,7 @@ async def test_dim_devmanager(aiohttp_client):
         "resp": "<ctl ret='ok' status='idle'/>",
         "ret": "ok",
     }
-    confserver.helperbot.send_command = mock.MagicMock(
+    bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_getstatus_resp)
     )
     resp = await client.post("/api/dim/devmanager.do", json=postbody)
@@ -874,7 +866,7 @@ async def test_dim_devmanager(aiohttp_client):
 
     # Test return fail timeout
     command_timeout_resp = {"id": "resp_1234", "errno": "timeout", "ret": "fail"}
-    confserver.helperbot.send_command = mock.MagicMock(
+    bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_timeout_resp)
     )
     resp = await client.post("/api/dim/devmanager.do", json=postbody)
@@ -886,7 +878,7 @@ async def test_dim_devmanager(aiohttp_client):
 
     # Set bot not on mqtt
     bumper.bot_set_mqtt("did_1234", False)
-    confserver.helperbot.send_command = mock.MagicMock(
+    bumper.mqtt_helperbot.send_command = mock.MagicMock(
         return_value=async_return(command_getstatus_resp)
     )
     resp = await client.post("/api/dim/devmanager.do", json=postbody)