From 5ac6663502b5db85159106fae97209cd47bb8a14 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Tue, 1 Oct 2019 20:20:23 -0400 Subject: [PATCH] fix send_command payloadType Used toType instead of payloadType... --- bumper/mqttserver.py | 4 ++-- tests/test_mqttserver.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bumper/mqttserver.py b/bumper/mqttserver.py index 14e7b49..c7ff20e 100644 --- a/bumper/mqttserver.py +++ b/bumper/mqttserver.py @@ -183,12 +183,12 @@ class MQTTHelperBot: cmdjson["payloadType"], ) try: - if cmdjson["toType"] == "x": + if cmdjson["payloadType"] == "x": await self.Client.publish( ttopic, str(cmdjson["payload"]).encode(), QOS_0 ) - if cmdjson["toType"] == "j": + if cmdjson["payloadType"] == "j": await self.Client.publish( ttopic, json.dumps(cmdjson["payload"]).encode(), QOS_0 ) diff --git a/tests/test_mqttserver.py b/tests/test_mqttserver.py index c685e15..b4f4aa0 100644 --- a/tests/test_mqttserver.py +++ b/tests/test_mqttserver.py @@ -348,9 +348,8 @@ async def test_helperbot_sendcommand(): 0.2 ) # Override wait_resp_timeout (so we don't wait 10 seconds for timeout) # Send response beforehand - msg_payload = ( - '{"body":{"code":0,"data":{"area":0,"cid":"111","start":"1569378657","time":6,"type":"auto"},"msg":"ok"},"header":{"fwVer":"1.6.4","hwVer":"0.1.1","pri":1,"ts":"1569380074036","tzm":480,"ver":"0.0.1"}}' - ) + msg_payload = '{"body":{"code":0,"data":{"area":0,"cid":"111","start":"1569378657","time":6,"type":"auto"},"msg":"ok"},"header":{"fwVer":"1.6.4","hwVer":"0.1.1","pri":1,"ts":"1569380074036","tzm":480,"ver":"0.0.1"}}' + msg_topic_name = ( "iot/p2p/getStats/bot_serial/ls1ok3/wC3g/helper1/bumper/helper1/p/testj/j" )