Skip to content

Make job completion order deterministic, improve tests #42

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

Open
cottsay wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make job completion order deterministic, improve tests #42

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
4 changes: 3 additions & 1 deletion colcon_parallel_executor/executor/parallel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ async def _execute(self, args, jobs, *, on_error):
f.identifier for f in futures.values())))

# check results of done futures
for done_future in done_futures:
for done_future in [
f for f in futures.keys() if f in done_futures
]:
job = futures[done_future]
del futures[done_future]
# get result without raising an exception
Expand Down
27 changes: 20 additions & 7 deletions test/test_executor_parallel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def test_parallel():

args = SimpleNamespace(parallel_workers=2)
jobs = OrderedDict()
jobs['one'] = Job1()
jobs['job1'] = Job1()

# success
rc = extension.execute(args, jobs)
Expand All @@ -119,8 +119,8 @@ def test_parallel():
ran_jobs.clear()

# return error code
jobs['two'] = Job2()
jobs['four'] = Job4()
jobs['job2'] = Job2()
jobs['job4'] = Job4()
rc = extension.execute(args, jobs)
assert rc == 2
assert ran_jobs == ['job1']
Expand All @@ -144,22 +144,22 @@ def test_parallel():
ran_jobs.clear()

# continue after error, keeping first error code
jobs['five'] = Job5()
jobs['job5'] = Job5()
rc = extension.execute(args, jobs, on_error=OnError.continue_)
assert rc == 2
assert ran_jobs == ['job1', 'job4']
ran_jobs.clear()

# continue but skip downstream
jobs['six'] = Job6()
jobs['seven'] = Job7()
jobs['job6'] = Job6()
jobs['job7'] = Job7()
rc = extension.execute(args, jobs, on_error=OnError.skip_downstream)
assert rc == 2
assert ran_jobs == ['job1', 'job7', 'job4']
ran_jobs.clear()

# exception
jobs['two'] = Job3()
jobs['job2'] = Job3()
rc = extension.execute(args, jobs)
assert isinstance(rc, RuntimeError)
assert ran_jobs == ['job1']
Expand Down Expand Up @@ -400,3 +400,16 @@ def test_parallel_workers_zero():
assert rc == 0
assert set(ran_jobs) == {'job1', 'job2'}
ran_jobs.clear()


def test_parallel_exception_skip_pending():
extension = ParallelExecutorExtension()
args = SimpleNamespace(parallel_workers=1)
jobs = OrderedDict()
jobs['job3'] = Job3()
jobs['job4'] = Job4()

rc = extension.execute(args, jobs, on_error=OnError.skip_pending)
assert isinstance(rc, RuntimeError)
assert ran_jobs == []
ran_jobs.clear()
Loading