diff options
author | Eric Wong <normalperson@yhbt.net> | 2011-06-16 23:57:31 +0000 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2011-06-17 07:28:12 +0000 |
commit | 593deb92e8ebd4e77e482c567d97b6ee496ac378 (patch) | |
tree | 9162663c0e66d59225fe28d1f3133a8e118868af /test/unit | |
parent | a0c59adf71506b8808de276b1288a319424ee71a (diff) | |
download | unicorn-593deb92e8ebd4e77e482c567d97b6ee496ac378.tar.gz |
rescuing from SystemExit and exit()-ing again is ugly, but changes made to lower stack depth positively affect _everyone_ so we'll tolerate some ugliness here. We'll need to disable graceful exit for some tests, too...
Diffstat (limited to 'test/unit')
-rw-r--r-- | test/unit/test_server.rb | 2 | ||||
-rw-r--r-- | test/unit/test_signals.rb | 2 | ||||
-rw-r--r-- | test/unit/test_upload.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb index 88d7aba..403bd1f 100644 --- a/test/unit/test_server.rb +++ b/test/unit/test_server.rb @@ -39,7 +39,7 @@ class WebServerTest < Test::Unit::TestCase redirect_test_io do wait_workers_ready("test_stderr.#$$.log", 1) File.truncate("test_stderr.#$$.log", 0) - @server.stop(true) + @server.stop(false) end reset_sig_handlers end diff --git a/test/unit/test_signals.rb b/test/unit/test_signals.rb index 71cf8f4..5a3b519 100644 --- a/test/unit/test_signals.rb +++ b/test/unit/test_signals.rb @@ -124,7 +124,7 @@ class SignalsTest < Test::Unit::TestCase assert diff > 1.0, "diff was #{diff.inspect}" assert diff < 60.0 ensure - Process.kill(:QUIT, pid) rescue nil + Process.kill(:TERM, pid) rescue nil end def test_response_write diff --git a/test/unit/test_upload.rb b/test/unit/test_upload.rb index e2c103a..7777e00 100644 --- a/test/unit/test_upload.rb +++ b/test/unit/test_upload.rb @@ -53,7 +53,7 @@ class UploadTest < Test::Unit::TestCase end def teardown - redirect_test_io { @server.stop(true) } if @server + redirect_test_io { @server.stop(false) } if @server @random.close reset_sig_handlers end |