Stop extending core classes

This removes the #unicorn_peeraddr methods from TCPSocket and
UNIXSocket core classes.  Instead, just move that logic into the
only place it needs to be used in HttpRequest.

2 files changed, 2 insertions, 54 deletions

diff --git a/test/unit/test_request.rb b/test/unit/test_request.rb
index dbe4069..7c438da 100644
--- a/test/unit/test_request.rb
+++ b/test/unit/test_request.rb
@@ -19,11 +19,7 @@ include Unicorn
 
 class RequestTest < Test::Unit::TestCase
 
-  class MockRequest < StringIO
-    def unicorn_peeraddr
-      '666.666.666.666'
-    end
-  end
+  class MockRequest < StringIO; end
 
   def setup
     @request = HttpRequest.new(Logger.new($stderr))
@@ -123,7 +119,7 @@ class RequestTest < Test::Unit::TestCase
     res = env = nil
     assert_nothing_raised { env = @request.read(client) }
     assert_equal "http", env['rack.url_scheme']
-    assert_equal '666.666.666.666', env['REMOTE_ADDR']
+    assert_equal '127.0.0.1', env['REMOTE_ADDR']
     assert_nothing_raised { res = @lint.call(env) }
   end
 
@@ -146,9 +142,6 @@ class RequestTest < Test::Unit::TestCase
     buf = (' ' * bs).freeze
     length = bs * count
     client = Tempfile.new('big_put')
-    def client.unicorn_peeraddr
-      '1.1.1.1'
-    end
     client.syswrite(
       "PUT / HTTP/1.1\r\n" \
       "Host: foo\r\n" \
diff --git a/test/unit/test_socket_helper.rb b/test/unit/test_socket_helper.rb
index 0608e24..3e28cb9 100644
--- a/test/unit/test_socket_helper.rb
+++ b/test/unit/test_socket_helper.rb
@@ -123,49 +123,4 @@ class TestSocketHelper < Test::Unit::TestCase
     sock_name(@unix_server)
   end
 
-  def test_tcp_unicorn_peeraddr
-    test_bind_listen_tcp
-    @tcp_server = server_cast(@tcp_listener)
-    tmp = Tempfile.new 'shared'
-    pid = fork do
-      client = @tcp_server.accept
-      IO.select([client])
-      assert_equal GET_SLASH, client.sysread(GET_SLASH.size)
-      tmp.syswrite "#{client.unicorn_peeraddr}"
-      exit 0
-    end
-    host, port = sock_name(@tcp_server).split(/:/)
-    client = TCPSocket.new(host, port.to_i)
-    client.syswrite(GET_SLASH)
-
-    pid, status = Process.waitpid2(pid)
-    assert_nothing_raised { client.close }
-    assert status.success?
-    tmp.sysseek 0
-    assert_equal @test_addr, tmp.sysread(4096)
-    tmp.sysseek 0
-  end
-
-  def test_unix_unicorn_peeraddr
-    test_bind_listen_unix
-    @unix_server = server_cast(@unix_listener)
-    tmp = Tempfile.new 'shared'
-    pid = fork do
-      client = @unix_server.accept
-      IO.select([client])
-      assert_equal GET_SLASH, client.sysread(4096)
-      tmp.syswrite "#{client.unicorn_peeraddr}"
-      exit 0
-    end
-    client = UNIXSocket.new(@unix_listener_path)
-    client.syswrite(GET_SLASH)
-
-    pid, status = Process.waitpid2(pid)
-    assert_nothing_raised { client.close }
-    assert status.success?
-    tmp.sysseek 0
-    assert_equal '127.0.0.1', tmp.sysread(4096)
-    tmp.sysseek 0
-  end
-
 end