diff options
author | Eric Wong <e@80x24.org> | 2016-02-29 08:18:55 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-02-29 08:22:02 +0000 |
commit | 7ee064f52ee740eeafa49089911f6eca18c67e38 (patch) | |
tree | 6bf2588b7d3b992d38b7056d8a230367cde479eb /test/test_server.rb | |
parent | 5fff94f35928feeb9d6bf91087ee7cdbe97ecdb7 (diff) | |
download | yahns-7ee064f52ee740eeafa49089911f6eca18c67e38.tar.gz |
We should not infinite loop, oops :x Also, ensure 'yahns' is in the directory in case tests are SIGKILL-ed and directories are left over.
Diffstat (limited to 'test/test_server.rb')
-rw-r--r-- | test/test_server.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test_server.rb b/test/test_server.rb index 87193e3..9f33b42 100644 --- a/test/test_server.rb +++ b/test/test_server.rb @@ -179,7 +179,7 @@ class TestServer < Testcase end def test_check_client_connection - tmpdir = Dir.mktmpdir + tmpdir = yahns_mktmpdir sock = "#{tmpdir}/sock" unix_srv = UNIXServer.new(sock) unix_srv.close_on_exec = true @@ -511,7 +511,7 @@ class TestServer < Testcase end def test_pidfile_usr2 - tmpdir = Dir.mktmpdir + tmpdir = yahns_mktmpdir pidf = "#{tmpdir}/pid" old = "#{pidf}.oldbin" err = @err @@ -635,7 +635,7 @@ class TestServer < Testcase ru = lambda { |_| [ 200, {'Content-Length'=>Dir.pwd.size.to_s }, [Dir.pwd] ] } - Dir.mktmpdir do |tmpdir| + yahns_mktmpdir do |tmpdir| begin pid = mkserver(cfg) do $LOAD_PATH << File.expand_path("lib") @@ -656,7 +656,7 @@ class TestServer < Testcase end def test_errors - tmpdir = Dir.mktmpdir + tmpdir = yahns_mktmpdir sock = "#{tmpdir}/sock" err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1] re = tmpfile(%w(rack .errors)) |