From 7ee064f52ee740eeafa49089911f6eca18c67e38 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 29 Feb 2016 08:18:55 +0000 Subject: test/*: fix mktmpdir usage for 1.9.3 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. --- test/test_serve_static.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/test_serve_static.rb') diff --git a/test/test_serve_static.rb b/test/test_serve_static.rb index 12932d2..68e84f7 100644 --- a/test/test_serve_static.rb +++ b/test/test_serve_static.rb @@ -10,7 +10,7 @@ class TestServeStatic < Testcase alias teardown server_helper_teardown def test_serve_static - tmpdir = Dir.mktmpdir + tmpdir = yahns_mktmpdir sock = "#{tmpdir}/sock" err = @err cfg = Yahns::Config.new @@ -120,7 +120,7 @@ class TestServeStatic < Testcase end def test_aborted_sendfile_closes_opened_path - tmpdir = Dir.mktmpdir + tmpdir = yahns_mktmpdir mksparse(tmpdir) fifo = "#{tmpdir}/to_path--close" assert system("mkfifo", fifo), "mkfifo" @@ -147,7 +147,7 @@ class TestServeStatic < Testcase end def test_truncated_sendfile - tmpdir = Dir.mktmpdir + tmpdir = yahns_mktmpdir size, sparse = mksparse(tmpdir) err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1] pid = mkserver(cfg) do @@ -169,7 +169,7 @@ class TestServeStatic < Testcase end def test_expanded_sendfile - tmpdir = Dir.mktmpdir + tmpdir = yahns_mktmpdir size, sparse = mksparse(tmpdir) err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1] pid = mkserver(cfg) do -- cgit v1.2.3-24-ge0c7