Skip to content

Commit 5fe24d2

Browse files
committed
Address Ruby 3.4 frozen string warnings and improve flaky tests
1 parent 8d9e7bb commit 5fe24d2

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

test/integration/processes_lifecycle_test.rb

+6-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ class ProcessesLifecycleTest < ActiveSupport::TestCase
6666
no_pause = enqueue_store_result_job("no pause")
6767
pause = enqueue_store_result_job("pause", pause: 1.second)
6868

69+
wait_while_with_timeout(1.second) { SolidQueue::ReadyExecution.count > 0 }
70+
6971
signal_process(@pid, :QUIT, wait: 0.4.second)
7072
wait_for_jobs_to_finish_for(2.seconds, except: pause)
7173

@@ -121,7 +123,9 @@ class ProcessesLifecycleTest < ActiveSupport::TestCase
121123
no_pause = enqueue_store_result_job("no pause")
122124
pause = enqueue_store_result_job("pause", pause: SolidQueue.shutdown_timeout + 10.second)
123125

124-
signal_process(@pid, :TERM, wait: 0.5.second)
126+
wait_while_with_timeout(1.second) { SolidQueue::ReadyExecution.count > 0 }
127+
128+
signal_process(@pid, :TERM, wait: 0.5)
125129

126130
sleep(SolidQueue.shutdown_timeout + 0.5.second)
127131

@@ -204,6 +208,7 @@ class ProcessesLifecycleTest < ActiveSupport::TestCase
204208

205209
worker = find_processes_registered_as("Worker").first
206210

211+
wait_while_with_timeout(1.second) { SolidQueue::ReadyExecution.count > 0 }
207212
signal_process(worker.pid, :TERM, wait: 0.1.second)
208213

209214
# Worker is gone

test/models/solid_queue/process_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class SolidQueue::ProcessTest < ActiveSupport::TestCase
6060
worker = SolidQueue::Worker.new(queues: "*", threads: 3, polling_interval: 0.2)
6161
hostname = "Basecamp’s-Computer"
6262

63-
Socket.stub :gethostname, hostname.force_encoding("ASCII-8BIT") do
63+
Socket.stub :gethostname, hostname.dup.force_encoding("ASCII-8BIT") do
6464
worker.start
6565
wait_for_registered_processes(1, timeout: 1.second)
6666

0 commit comments

Comments
 (0)