GD: More meaningful errors around events
Print event name with its content in exceptions
Test: observe eror message
Change-Id: Ib1e37e9b605376da81965da86af10101aa7420b6
diff --git a/system/gd/cert/event_stream.py b/system/gd/cert/event_stream.py
index fc9fb56..27c27ea 100644
--- a/system/gd/cert/event_stream.py
+++ b/system/gd/cert/event_stream.py
@@ -57,6 +57,12 @@
self.stream.unregister(self.__event_callback)
+def pretty_print(proto_event):
+ return '{} {}'.format(
+ type(proto_event).__name__,
+ text_format.MessageToString(proto_event, as_one_line=True))
+
+
DEFAULT_TIMEOUT_SECONDS = 3
@@ -337,8 +343,7 @@
return # Avoid an assert in MessageToString(None, ...)
asserts.assert_true(
event is None,
- msg=("Expected None matching, but got %s" % text_format.MessageToString(
- event, as_one_line=True)))
+ msg='Expected None matching, but got {}'.format(pretty_print(event)))
def NOT_FOR_YOU_assert_none(istream,
@@ -348,7 +353,6 @@
event = istream.get_event_queue().get(timeout=timeout.total_seconds())
asserts.assert_true(
event is None,
- msg=("Expected None, but got %s" % text_format.MessageToString(
- event, as_one_line=True)))
+ msg='Expected None, but got {}'.format(pretty_print(event)))
except Empty:
return