mia/bumper
1
0
Fork 0
Code Issues 47 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Re-org and start of API #47

Merged
bmartin5692 merged 10 commits from wip_dev into master 2019-06-21 03:26:06 +02:00
Conversation 1 Commits 10 Files changed 12 +13 -27
2 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 40d4af3f80 - Show all commits

6
bumper/confserver.py
View file

@ -1105,9 +1105,6 @@ class ConfServer:
confserverlog.exception("{}".format(e)) confserverlog.exception("{}".format(e))
async def handle_lg_log(self, request): # EcoVacs Home 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: try:
json_body = json.loads(await request.text()) json_body = json.loads(await request.text())
@ -1187,9 +1184,6 @@ class ConfServer:
confserverlog.exception("{}".format(e)) confserverlog.exception("{}".format(e))
async def handle_devmanager_botcommand(self, request): 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: try:
json_body = json.loads(await request.text()) json_body = json.loads(await request.text())

34
tests/test_confserver.py
View file

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