Update server_spawn.rb

MSP-Greg · Apr 19, 2024 · 3fae82a · 3fae82a
1 parent c991f60
commit 3fae82a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/test/helpers/test_puma/server_spawn.rb b/test/helpers/test_puma/server_spawn.rb
@@ -120,15 +120,16 @@ def stop_server(pid = @pid, signal: :SIGINT,  timeout: 10, log: nil)
       @server_stopped = true
       ary = kill_and_wait pid, signal: signal
 
-      if pid == @pid && @spawn_pid != @pid && ary.nil?
-        ary = wait2_timeout @spawn_pid,  timeout: timeout
-      end
-
       if pid == @pid
+        if ary.nil? && @spawn_pid != pid
+          ary = wait2_timeout @spawn_pid, timeout: timeout
+        end
+
         @server = nil
         @spawn_pid = nil if @spawn_pid == @pid
         @pid = nil
       end
+
       ary
     end