Skip to content

Fix conflicts in Mergify/bp/humble/pr 353 #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapande-1995 merged 1 commit into from
Jan 17, 2024
Merged

Fix conflicts in Mergify/bp/humble/pr 353 #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions launch_testing_ros/launch_testing_ros/wait_for_topics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ def method_1():
with WaitForTopics(topic_list, timeout=5.0):
# 'topic_1' and 'topic_2' received at least one message each
print('Given topics are receiving messages !')
<<<<<<< HEAD
print(wait_for_topics.topics_not_received()) # Should be an empty set
print(wait_for_topics.topics_received()) # Should be {'topic_1', 'topic_2'}
print(wait_for_topics.messages_received('topic_1')) # Should be [message_1, ...]
wait_for_topics.shutdown()

# Method 2, calling wait() and shutdown() manually
def method_2():
Expand All @@ -49,12 +52,6 @@ def method_2():
print(wait_for_topics.topics_not_received()) # Should be an empty set
print(wait_for_topics.topics_received()) # Should be {'topic_1', 'topic_2'}
wait_for_topics.shutdown()
=======
print(wait_for_topics.topics_not_received()) # Should be an empty set
print(wait_for_topics.topics_received()) # Should be {'topic_1', 'topic_2'}
print(wait_for_topics.messages_received('topic_1')) # Should be [message_1, ...]
wait_for_topics.shutdown()
>>>>>>> 2d125a5 (`WaitForTopics`: get content of messages for each topic (#353))
"""

def __init__(self, topic_tuples, timeout=5.0, messages_received_buffer_length=10):
Expand Down
4 changes: 0 additions & 4 deletions launch_testing_ros/test/examples/wait_for_topic_launch_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,9 @@ def test_topics_successful(self, count):
message_pattern = re.compile(r'Hello World: \d+')

# Method 1 : Using the magic methods and 'with' keyword
<<<<<<< HEAD
with WaitForTopics(topic_list, timeout=2.0) as wait_for_node_object_1:
=======
with WaitForTopics(
topic_list, timeout=2.0, messages_received_buffer_length=10
) as wait_for_node_object_1:
>>>>>>> 2d125a5 (`WaitForTopics`: get content of messages for each topic (#353))
assert wait_for_node_object_1.topics_received() == expected_topics
assert wait_for_node_object_1.topics_not_received() == set()
for topic_name, _ in topic_list:
Expand Down