Skip to content

Commit 5ce7ffc

Browse files
committed
chore: remove timeout argument of wait_termination
It's always zero now that we don't depend on orocos.rb for the remote manager
1 parent 117c86a commit 5ce7ffc

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

lib/syskit/process_managers/in_process/manager.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def create_log_dir(log_dir, time_tag, metadata = {}); end
9797
#
9898
# Returns a hash that maps deployment names to the Status
9999
# object that represents their exit status.
100-
def wait_termination(_timeout = nil)
100+
def wait_termination
101101
dead_processes = {}
102102
processes.delete_if do |_, process|
103103
next unless process.dead?

lib/syskit/process_managers/ruby_tasks/manager.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def create_log_dir(log_dir, time_tag, metadata = {}); end
7575
#
7676
# Returns a hash that maps deployment names to the Status
7777
# object that represents their exit status.
78-
def wait_termination(_timeout = nil)
78+
def wait_termination
7979
result = terminated_deployments
8080
@terminated_deployments = {}
8181
result

lib/syskit/process_managers/unmanaged/manager.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def create_log_dir(log_dir, time_tag, metadata = {}); end
106106
#
107107
# Returns a hash that maps deployment names to the Status
108108
# object that represents their exit status.
109-
def wait_termination(_timeout = nil)
109+
def wait_termination
110110
# Verify that the monitor threads are in a good state, and
111111
# gather the ones that are actually dead
112112
dead_processes = {}

lib/syskit/roby_app/configuration.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ def process_server(*args)
654654
end
655655

656656
ModelOnlyServer = Struct.new :loader do
657-
def wait_termination(timeout = 0)
657+
def wait_termination
658658
[]
659659
end
660660

lib/syskit/runtime/update_deployment_states.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def self.handle_dead_deployments(plan)
1919
server_config = Syskit.conf.each_process_server_config.to_a
2020
server_config.each do |config|
2121
begin
22-
dead_deployments = config.client.wait_termination(0)
22+
dead_deployments = config.client.wait_termination
2323
rescue ::Exception => e
2424
deployments = abort_process_server(plan, config)
2525
all_dead_deployments.merge(deployments)

test/process_managers/test_unmanaged.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ module ProcessManagers
142142
.and_raise(RuntimeError)
143143
capture_log(process, :fatal) do
144144
assert_equal [process],
145-
process_manager.wait_termination(0).keys
146-
assert_equal({}, process_manager.wait_termination(0))
145+
process_manager.wait_termination.keys
146+
assert_equal({}, process_manager.wait_termination)
147147
end
148148
ensure (
149149
process_manager.processes[@unmanaged_task_name] = process

test/runtime/test_update_deployment_state.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def initialize
1313
@loader = FlexMock.undefined
1414
end
1515

16-
def wait_termination(*)
16+
def wait_termination
1717
dead_processes = @killed_processes
1818
@killed_processes = []
1919
dead_processes

test/test_deployment.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def initialize
1212
@loader = FlexMock.undefined
1313
end
1414

15-
def wait_termination(*)
15+
def wait_termination
1616
dead_processes = @killed_processes
1717
@killed_processes = []
1818
dead_processes

0 commit comments

Comments
 (0)