From 6c7624896063e58f67d732b5f080e96f36bc5eda Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 17 Mar 2023 13:57:42 +1100 Subject: [PATCH] tests/multi_bluetooth: Use multitest.output_metric in BLE perf tests. Signed-off-by: Damien George --- tests/multi_bluetooth/perf_gatt_char_write.py | 2 +- tests/multi_bluetooth/perf_gatt_notify.py | 2 +- tests/multi_bluetooth/perf_gatt_notify.py.exp | 5 +++++ tests/multi_bluetooth/perf_l2cap.py | 2 +- tests/multi_bluetooth/perf_l2cap.py.exp | 4 ++++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/multi_bluetooth/perf_gatt_char_write.py b/tests/multi_bluetooth/perf_gatt_char_write.py index 00607f0090..681fc052c6 100644 --- a/tests/multi_bluetooth/perf_gatt_char_write.py +++ b/tests/multi_bluetooth/perf_gatt_char_write.py @@ -128,7 +128,7 @@ def instance1(): ticks_end = time.ticks_ms() ticks_total = time.ticks_diff(ticks_end, ticks_start) - print( + multitest.output_metric( "Did {} writes in {} ms. {} ms/write, {} bytes/sec".format( _NUM_NOTIFICATIONS, ticks_total, diff --git a/tests/multi_bluetooth/perf_gatt_notify.py b/tests/multi_bluetooth/perf_gatt_notify.py index 88986dda3d..8acccc6470 100644 --- a/tests/multi_bluetooth/perf_gatt_notify.py +++ b/tests/multi_bluetooth/perf_gatt_notify.py @@ -90,7 +90,7 @@ def instance0(): ticks_end = time.ticks_ms() ticks_total = time.ticks_diff(ticks_end, ticks_start) - print( + multitest.output_metric( "Acknowledged {} notifications in {} ms. {} ms/notification.".format( _NUM_NOTIFICATIONS, ticks_total, ticks_total // _NUM_NOTIFICATIONS ) diff --git a/tests/multi_bluetooth/perf_gatt_notify.py.exp b/tests/multi_bluetooth/perf_gatt_notify.py.exp index e69de29bb2..5a4385530e 100644 --- a/tests/multi_bluetooth/perf_gatt_notify.py.exp +++ b/tests/multi_bluetooth/perf_gatt_notify.py.exp @@ -0,0 +1,5 @@ +--- instance0 --- +gap_advertise +gap_disconnect: True +--- instance1 --- +gap_connect diff --git a/tests/multi_bluetooth/perf_l2cap.py b/tests/multi_bluetooth/perf_l2cap.py index 0603a02a81..a953854233 100644 --- a/tests/multi_bluetooth/perf_l2cap.py +++ b/tests/multi_bluetooth/perf_l2cap.py @@ -134,7 +134,7 @@ def instance1(): ble.l2cap_disconnect(conn_handle, cid) wait_for_event(_IRQ_L2CAP_DISCONNECT, TIMEOUT_MS) - print( + multitest.output_metric( "Received {}/{} bytes in {} ms. {} B/s".format( recv_bytes, recv_correct, total_ticks, recv_bytes * 1000 // total_ticks ) diff --git a/tests/multi_bluetooth/perf_l2cap.py.exp b/tests/multi_bluetooth/perf_l2cap.py.exp index e69de29bb2..5e4b7a7557 100644 --- a/tests/multi_bluetooth/perf_l2cap.py.exp +++ b/tests/multi_bluetooth/perf_l2cap.py.exp @@ -0,0 +1,4 @@ +--- instance0 --- + +--- instance1 --- +