From 5b308775a8c46d71b126f623cef196540a44985a Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 9 Mar 2009 15:16:28 -0700 Subject: Revert "exec: disable embedded switch parsing in config.ru" This reverts commit e66ab79b8b5bc5311c750bf03868a7b2574f4ea1. Conflicts: bin/unicorn --- test/exec/test_exec.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/exec/test_exec.rb b/test/exec/test_exec.rb index 9a149f3..6f4d12c 100644 --- a/test/exec/test_exec.rb +++ b/test/exec/test_exec.rb @@ -316,18 +316,14 @@ end assert status.success?, "exited successfully" end - def test_ignore_embedded_cli_switches - port2 = unused_port(@addr) + def test_read_embedded_cli_switches File.open("config.ru", "wb") do |fp| - fp.syswrite("#\\ -p #{port2} -o #{@addr}\n") + fp.syswrite("#\\ -p #{@port} -o #{@addr}\n") fp.syswrite(HI) end - pid = fork do - redirect_test_io { exec($unicorn_bin, "-l#{@addr}:#{@port}") } - end + pid = fork { redirect_test_io { exec($unicorn_bin) } } results = retry_hit(["http://#{@addr}:#{@port}/"]) assert_equal String, results[0].class - assert_raises(Errno::ECONNREFUSED) { TCPSocket.new(@addr, port2) } assert_shutdown(pid) end -- cgit v1.2.3-24-ge0c7