tiny-test-fw: invoke expect callbacks in order of appearance

Previously the callbacks were invoked in the same order as the list of
patterns to be matched.

diff --git a/tools/tiny-test-fw/DUT.py b/tools/tiny-test-fw/DUT.py
index 091a961549b471f0ee3e1bb546b27d4975af358d..97487525ed8da97e6afd0bd3b86f1442e95e9436 100644 (file)
--- a/tools/tiny-test-fw/DUT.py
+++ b/tools/tiny-test-fw/DUT.py
@@ -576,7 +576,10 @@ class BaseDUT(object):
                 data = self.data_cache.get_data(time_remaining)
 
         if match_succeed:
-            # do callback and flush matched data cache
+            # sort matched items according to order of appearance in the input data,
+            # so that the callbacks are invoked in correct order
+            matched_expect_items = sorted(matched_expect_items, key=lambda it: it["index"])
+            # invoke callbacks and flush matched data cache
             slice_index = -1
             for expect_item in matched_expect_items:
                 # trigger callback