tests/multi_bluetooth: Use multitest.output_metric in BLE perf tests.

dpgeorge · dpgeorge · commit 6c7624896063 · 2023-03-23T13:18:52.000+11:00
Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,4 @@
+--- instance0 ---
+
+--- instance1 ---
+

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ def instance0():`
`90`	`90`
`91`	`91`	`ticks_end = time.ticks_ms()`
`92`	`92`	`ticks_total = time.ticks_diff(ticks_end, ticks_start)`
`93`		`- print(`
	`93`	`+ multitest.output_metric(`
`94`	`94`	`"Acknowledged {} notifications in {} ms. {} ms/notification.".format(`
`95`	`95`	`_NUM_NOTIFICATIONS, ticks_total, ticks_total // _NUM_NOTIFICATIONS`
`96`	`96`	`)`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ def instance1():`
`134`	`134`	`ble.l2cap_disconnect(conn_handle, cid)`
`135`	`135`	`wait_for_event(_IRQ_L2CAP_DISCONNECT, TIMEOUT_MS)`
`136`	`136`
`137`		`- print(`
	`137`	`+ multitest.output_metric(`
`138`	`138`	`"Received {}/{} bytes in {} ms. {} B/s".format(`
`139`	`139`	`recv_bytes, recv_correct, total_ticks, recv_bytes * 1000 // total_ticks`
`140`	`140`	`)`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +--- instance0 ---
++
 +--- instance1 ---
++