feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

CI: fix pattern in test case test_examples_protocol_mqtt5

Browse Source
This commit is contained in:
Chen Yudong
2022-12-21 10:50:11 +08:00
parent 677e2fb19a
commit 4af4edc3da
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/protocols/mqtt5/pytest_mqtt5.py
View File

@@ -26,24 +26,24 @@ def test_examples_protocol_mqtt5(dut: Dut) -> None:
# check if connected or not # check if connected or not
dut.expect_exact('MQTT_EVENT_CONNECTED', timeout=30) dut.expect_exact('MQTT_EVENT_CONNECTED', timeout=30)
# check log # check log
res = dut.expect(r'sent publish successful, msg_id=(\d+)') res = dut.expect(r'sent publish successful, msg_id=(\d+)[^\d]')
msgid_pub1 = res.group(1).decode('utf8') msgid_pub1 = res.group(1).decode('utf8')
res = dut.expect(r'sent subscribe successful, msg_id=(\d+)') res = dut.expect(r'sent subscribe successful, msg_id=(\d+)[^\d]')
msgid_sub1 = res.group(1).decode('utf8') msgid_sub1 = res.group(1).decode('utf8')
res = dut.expect(r'sent subscribe successful, msg_id=(\d+)') res = dut.expect(r'sent subscribe successful, msg_id=(\d+)[^\d]')
msgid_sub2 = res.group(1).decode('utf8') msgid_sub2 = res.group(1).decode('utf8')
res = dut.expect(r'sent unsubscribe successful, msg_id=(\d+)') res = dut.expect(r'sent unsubscribe successful, msg_id=(\d+)[^\d]')
msgid_unsub = res.group(1).decode('utf8') msgid_unsub = res.group(1).decode('utf8')
res = dut.expect(r'MQTT_EVENT_PUBLISHED, msg_id=(\d+)') res = dut.expect(r'MQTT_EVENT_PUBLISHED, msg_id=(\d+)[^\d]')
msgid_pubd = res.group(1).decode('utf8') msgid_pubd = res.group(1).decode('utf8')
assert msgid_pubd == msgid_pub1 assert msgid_pubd == msgid_pub1
res = dut.expect(r'MQTT_EVENT_SUBSCRIBED, msg_id=(\d+)') res = dut.expect(r'MQTT_EVENT_SUBSCRIBED, msg_id=(\d+)[^\d]')
msgid_subd = res.group(1).decode('utf8') msgid_subd = res.group(1).decode('utf8')
assert msgid_subd == msgid_sub1 assert msgid_subd == msgid_sub1
dut.expect_exact('sent publish successful, msg_id=0') dut.expect_exact('sent publish successful, msg_id=0')
res = dut.expect(r'MQTT_EVENT_SUBSCRIBED, msg_id=(\d+)') res = dut.expect(r'MQTT_EVENT_SUBSCRIBED, msg_id=(\d+)[^\d]')
msgid_subd = res.group(1).decode('utf8') msgid_subd = res.group(1).decode('utf8')
assert msgid_subd == msgid_sub2 assert msgid_subd == msgid_sub2
@@ -57,7 +57,7 @@ def test_examples_protocol_mqtt5(dut: Dut) -> None:
dut.expect_exact('correlation_data is 123456') dut.expect_exact('correlation_data is 123456')
dut.expect_exact('TOPIC=/topic/qos1') dut.expect_exact('TOPIC=/topic/qos1')
dut.expect_exact('DATA=data_3') dut.expect_exact('DATA=data_3')
res = dut.expect(r'MQTT_EVENT_UNSUBSCRIBED, msg_id=(\d+)') res = dut.expect(r'MQTT_EVENT_UNSUBSCRIBED, msg_id=(\d+)[^\d]')
msgid_unsubd = res.group(1).decode('utf8') msgid_unsubd = res.group(1).decode('utf8')
assert msgid_unsubd == msgid_unsub assert msgid_unsubd == msgid_unsub