Merge pull request #136 from Earlopain/port-more-tests

Port more tests

Author: casperisfine

lib/pitchfork/worker.rb

@@ -110,11 +110,6 @@ def to_io # IO.select-compatible
       @to_io.to_io
     end
 
-    # master fakes SIGQUIT using this
-    def quit # :nodoc:
-      @master = @master.close if @master
-    end
-
     def master=(socket)
       @master = MessageSocket.new(socket)
     end

test/integration/listener_names.ru renamed to test/integration/apps/listener_names.ru

@@ -154,6 +154,21 @@ def test_listen_queues
     assert_clean_shutdown(pid)
   end
 
+  def test_listener_names
+    addr, port = unused_port
+
+    pid = spawn_server(app: File.join(ROOT, "test/integration/apps/listener_names.ru"), config: <<~CONFIG)
+      listen "#{addr}:#{port}"
+      worker_processes 1
+    CONFIG
+
+    assert_healthy("http://#{addr}:#{port}")
+    listener_names = Net::HTTP.get(URI("http://#{addr}:#{port}"))
+    
+    assert_equal(["#{addr}:#{port}"].inspect, listener_names)
+    assert_clean_shutdown(pid)
+  end
+
   def test_modify_internals
     addr, port = unused_port
 
@@ -173,4 +188,32 @@ def test_modify_internals
 
     assert_clean_shutdown(pid)
   end
+
+  def test_at_exit_handlers
+    addr, port = unused_port
+
+    pid = spawn_server(app: File.join(ROOT, "test/integration/pid.ru"), config: <<~CONFIG)
+      listen "#{addr}:#{port}"
+
+      at_exit { \$stderr.puts("\#{Process.pid} BOTH") }
+      END { \$stderr.puts("\#{Process.pid} END BOTH") }
+      after_worker_fork do |_,_|
+        at_exit { \$stderr.puts("\#{Process.pid} WORKER ONLY") }
+        END { \$stderr.puts("\#{Process.pid} END WORKER ONLY") }
+      end
+    CONFIG
+
+    assert_healthy("http://#{addr}:#{port}")
+
+    worker_pid = Net::HTTP.get(URI("http://#{addr}:#{port}")).strip
+
+    assert_clean_shutdown(pid)
+    
+    assert_stderr("#{worker_pid} BOTH")
+    assert_stderr("#{pid} BOTH")
+    assert_stderr("#{worker_pid} END BOTH")
+    assert_stderr("#{pid} END BOTH")
+    assert_stderr("#{worker_pid} WORKER ONLY")
+    assert_stderr("#{worker_pid} END WORKER ONLY")
+  end
 end