Skip to content

Fix merge conflicts in #1653 humble backport #1713

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
ahcorde merged 1 commit into from
Aug 21, 2026
+6 −16
Merged

Fix merge conflicts in #1653 humble backport #1713

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
22 changes: 6 additions & 16 deletions rclpy/test/test_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ def test_coroutine_exception_after_await(self):
executor = cls(context=self.context)
executor.add_node(self.node)

first_fut = executor.create_future()
second_fut = executor.create_future()
first_fut = Future(executor=executor)
second_fut = Future(executor=executor)

async def coro_that_raises():
first_fut.set_result(None)
Expand All @@ -427,9 +427,9 @@ def test_cancel_task_while_awaiting_future(self):
executor = cls(context=self.context)
executor.add_node(self.node)

first_fut = executor.create_future()
second_fut = executor.create_future()
third_fut = executor.create_future()
first_fut = Future(executor=executor)
second_fut = Future(executor=executor)
third_fut = Future(executor=executor)

async def coro():
first_fut.set_result(None)
Expand Down Expand Up @@ -458,7 +458,7 @@ def test_await_already_completed_future(self):
executor = cls(context=self.context)
executor.add_node(self.node)

fut = executor.create_future()
fut = Future(executor=executor)
fut.set_result('done') # complete before the task runs

async def coro():
Expand All @@ -470,16 +470,6 @@ async def coro():
self.assertTrue(task.done())
self.assertEqual('done', task.result())

def test_create_task_during_spin(self):
self.assertIsNotNone(self.node.handle)
for cls in [SingleThreadedExecutor, EventsExecutor]:
with self.subTest(cls=cls):
executor = cls(context=self.context)
executor.add_node(self.node)

self.assertTrue(future.done())
self.assertEqual('Sentinel Result', future.result())

def test_global_executor_completes_async_task(self):
self.assertIsNotNone(self.node.handle)

Expand Down