Skip to content

Commit

Permalink
Remove unused option in test helper and unused test helper
Browse files Browse the repository at this point in the history
  • Loading branch information
rosa committed Nov 23, 2023
1 parent ee5fcc6 commit feef30b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 20 deletions.
8 changes: 0 additions & 8 deletions test/integration/processes_lifecycle_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,6 @@ class ProcessLifecycleTest < ActiveSupport::TestCase
end

private
def terminate_registered_processes
skip_active_record_query_cache do
SolidQueue::Process.find_each do |process|
terminate_process(process.metadata["pid"], from_parent: false)
end
end
end

def assert_clean_termination
wait_for_registered_processes 0, timeout: 0.2.second
assert_no_registered_processes
Expand Down
17 changes: 5 additions & 12 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,15 @@ def find_processes_registered_as(kind)
end
end

def terminate_process(pid, timeout: 10, signal: :TERM, from_parent: true)
def terminate_process(pid, timeout: 10, signal: :TERM)
signal_process(pid, signal)
wait_for_process_termination_with_timeout(pid, timeout: timeout, from_parent: from_parent)
wait_for_process_termination_with_timeout(pid, timeout: timeout)
end

def wait_for_process_termination_with_timeout(pid, timeout: 10, from_parent: true, exitstatus: 0)
def wait_for_process_termination_with_timeout(pid, timeout: 10, exitstatus: 0)
Timeout.timeout(timeout) do
if from_parent
Process.waitpid(pid)
assert exitstatus, $?.exitstatus
else
loop do
break unless process_exists?(pid)
sleep 0.05
end
end
Process.waitpid(pid)
assert exitstatus, $?.exitstatus
end
rescue Timeout::Error
signal_process(pid, :KILL)
Expand Down

0 comments on commit feef30b

Please sign in to comment.