Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-08-18 01:48:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Test fixes for INC_MEMTRACK=OFF

Browse Source
This commit is contained in:
Roger A. Light
2026-04-16 21:35:46 +01:00
committed by Roger Light
parent e897b3a4d0
commit 2f88c272bb
2 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/broker/22-http-api-api.py
+20 -11
View File
@@ -31,18 +31,24 @@ def check_sys_tree(http_conn):
raise ValueError(f"/api/v1/systree {response.status}")
payload = json.loads(response.read().decode('utf-8'))
for topic in [
'$SYS/broker/clients/connected',
'$SYS/broker/clients/disconnected',
'$SYS/broker/clients/maximum',
'$SYS/broker/connections/socket/count',
topics = [
'$SYS/broker/clients/connected',
'$SYS/broker/clients/disconnected',
'$SYS/broker/clients/maximum',
'$SYS/broker/connections/socket/count',
'$SYS/broker/messages/stored',
'$SYS/broker/retained messages/count',
'$SYS/broker/store/messages/bytes',
'$SYS/broker/uptime'
]
if mosq_test.check_features(["INC_MEMTRACK"]):
topics.extend([
'$SYS/broker/heap/current',
'$SYS/broker/heap/maximum',
'$SYS/broker/messages/stored',
'$SYS/broker/retained messages/count',
'$SYS/broker/store/messages/bytes',
'$SYS/broker/uptime']:
])
for topic in topics:
# Protect against values being slightly different by
# setting to a known value
# This read will fail if the key doesn't already exist
@@ -61,8 +67,6 @@ def check_sys_tree(http_conn):
'$SYS/broker/subscriptions/count': 0,
'$SYS/broker/shared_subscriptions/count': 0,
'$SYS/broker/retained messages/count': -1,
'$SYS/broker/heap/current': -1,
'$SYS/broker/heap/maximum': -1,
'$SYS/broker/messages/received': 0,
'$SYS/broker/messages/sent': 0,
'$SYS/broker/bytes/received': 0,
@@ -77,6 +81,11 @@ def check_sys_tree(http_conn):
'$SYS/broker/publish/messages/sent': 0,
'$SYS/broker/uptime': -1
}
if mosq_test.check_features(["INC_MEMTRACK"]):
expected_payload['$SYS/broker/heap/current'] = -1
expected_payload['$SYS/broker/heap/maximum'] = -1
if payload != expected_payload:
raise ValueError(f"/api/v1/systree payload\n{payload}\n{expected_payload}")
test/broker/22-http-api-tls.py
+20 -11
View File
@@ -30,18 +30,24 @@ def check_sys_tree(http_conn):
raise ValueError(f"Error: /api/v1/systree {response.status}")
payload = json.loads(response.read().decode('utf-8'))
for topic in [
'$SYS/broker/clients/maximum',
'$SYS/broker/connections/socket/count',
topics = [
'$SYS/broker/clients/maximum',
'$SYS/broker/connections/socket/count',
'$SYS/broker/messages/received',
'$SYS/broker/bytes/received',
'$SYS/broker/messages/stored',
'$SYS/broker/retained messages/count',
'$SYS/broker/store/messages/bytes',
'$SYS/broker/uptime'
]
if mosq_test.check_features(["INC_MEMTRACK"]):
topics.extend([
'$SYS/broker/heap/current',
'$SYS/broker/heap/maximum',
'$SYS/broker/messages/received',
'$SYS/broker/bytes/received',
'$SYS/broker/messages/stored',
'$SYS/broker/retained messages/count',
'$SYS/broker/store/messages/bytes',
'$SYS/broker/uptime']:
])
for topic in topics:
# Protect against values being slightly different by
# setting to a known value
# This read will fail if the key doesn't already exist
@@ -60,8 +66,6 @@ def check_sys_tree(http_conn):
'$SYS/broker/subscriptions/count': 0,
'$SYS/broker/shared_subscriptions/count': 0,
'$SYS/broker/retained messages/count': -1,
'$SYS/broker/heap/current': -1,
'$SYS/broker/heap/maximum': -1,
'$SYS/broker/messages/received': -1,
'$SYS/broker/messages/sent': 0,
'$SYS/broker/bytes/received': -1,
@@ -76,6 +80,11 @@ def check_sys_tree(http_conn):
'$SYS/broker/publish/messages/sent': 0,
'$SYS/broker/uptime': -1
}
if mosq_test.check_features(["INC_MEMTRACK"]):
expected_payload['$SYS/broker/heap/current'] = -1
expected_payload['$SYS/broker/heap/maximum'] = -1
if payload != expected_payload:
raise ValueError(f"Error: /api/v1/systree payload\n{payload}\n{expected_payload}")