mib updated this revision to Diff 516854.
mib marked 2 inline comments as done.
mib edited the summary of this revision.
mib added a comment.
Address @bulbazord comments.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D149175/new/
https://reviews.llvm.org/D149175
Files:
lldb/packages/Python/lldbsuite/test/lldbutil.py
Index: lldb/packages/Python/lldbsuite/test/lldbutil.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lldbutil.py
+++ lldb/packages/Python/lldbsuite/test/lldbutil.py
@@ -1202,18 +1202,25 @@
broadcaster.AddListener(listener, event_mask)
return listener
-def fetch_next_event(test, listener, broadcaster, timeout=10):
+def fetch_next_event(test, listener, broadcaster, match_class=False,
timeout=10):
"""Fetch one event from the listener and return it if it matches the
provided broadcaster.
+ If `match_class` is set to True, this will match an event with an entire
broadcaster class.
Fails otherwise."""
event = lldb.SBEvent()
if listener.WaitForEvent(timeout, event):
- if event.BroadcasterMatchesRef(broadcaster):
- return event
+ if match_class:
+ if event.GetBroadcasterClass() == broadcaster:
+ return event
+ else:
+ if event.BroadcasterMatchesRef(broadcaster):
+ return event
+ stream = lldb.SBStream()
+ event.GetDescription(stream)
test.fail("received event '%s' from unexpected broadcaster '%s'." %
- (event.GetDescription(), event.GetBroadcaster().GetName()))
+ (stream.GetData(), event.GetBroadcaster().GetName()))
test.fail("couldn't fetch an event before reaching the timeout.")
Index: lldb/packages/Python/lldbsuite/test/lldbutil.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lldbutil.py
+++ lldb/packages/Python/lldbsuite/test/lldbutil.py
@@ -1202,18 +1202,25 @@
broadcaster.AddListener(listener, event_mask)
return listener
-def fetch_next_event(test, listener, broadcaster, timeout=10):
+def fetch_next_event(test, listener, broadcaster, match_class=False, timeout=10):
"""Fetch one event from the listener and return it if it matches the provided broadcaster.
+ If `match_class` is set to True, this will match an event with an entire broadcaster class.
Fails otherwise."""
event = lldb.SBEvent()
if listener.WaitForEvent(timeout, event):
- if event.BroadcasterMatchesRef(broadcaster):
- return event
+ if match_class:
+ if event.GetBroadcasterClass() == broadcaster:
+ return event
+ else:
+ if event.BroadcasterMatchesRef(broadcaster):
+ return event
+ stream = lldb.SBStream()
+ event.GetDescription(stream)
test.fail("received event '%s' from unexpected broadcaster '%s'." %
- (event.GetDescription(), event.GetBroadcaster().GetName()))
+ (stream.GetData(), event.GetBroadcaster().GetName()))
test.fail("couldn't fetch an event before reaching the timeout.")
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
