Improve utilities

Author: dandavison

tests/helpers/__init__.py

@@ -318,7 +318,7 @@ def _format_row(items: list[str], truncate: bool = False) -> str:
         return " | ".join(f"{item:<{col_width - 3}}" for item in items)
 
     headers = [handle.id for handle in handles]
-    print(_format_row(headers, truncate=True))
+    print("\n" + _format_row(headers, truncate=True))
     print("-" * (col_width * len(handles) + len(handles) - 1))
     for handle, event, event_num in all_events:
         event_type = EventType.Name(event.event_type).removeprefix("EVENT_TYPE_")

tests/nexus/test_workflow_caller_cancellation_types.py

@@ -269,15 +269,26 @@ def _event_time(
     _all_events = iter(sorted(all_events, key=_event_time))
     _expected_events = iter(expected_events)
 
+    previous_expected_handle, previous_expected_event_type_name = None, None
     for expected_handle, expected_event_type in _expected_events:
         expected_event_type_name = EventType.Name(expected_event_type).removeprefix(
             "EVENT_TYPE_"
         )
-        assert next(
+        has_expected = next(
             (
                 (h, e)
                 for h, e in _all_events
                 if h == expected_handle and e.event_type == expected_event_type
             ),
             None,
-        ), f"Expected {expected_event_type_name} in {expected_handle.id}"
+        )
+        if not has_expected:
+            if previous_expected_handle is not None:
+                prefix = f"After {previous_expected_event_type_name} in {previous_expected_handle.id}, "
+            else:
+                prefix = ""
+            pytest.fail(
+                f"{prefix}expected {expected_event_type_name} in {expected_handle.id}"
+            )
+        previous_expected_event_type_name = expected_event_type_name
+        previous_expected_handle = expected_handle