From 5d5377e094745ee76cd066d2244c52b40647d1cc Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 26 Oct 2013 01:58:34 +0000 Subject: tests: increase mkserver use to reduce LoC This reduces the amount of code we have in our tests to improve maintainability. --- test/test_serve_static.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'test/test_serve_static.rb') diff --git a/test/test_serve_static.rb b/test/test_serve_static.rb index 95c07bc..6cb337e 100644 --- a/test/test_serve_static.rb +++ b/test/test_serve_static.rb @@ -19,11 +19,7 @@ class TestServeStatic < Testcase end logger(Logger.new(err.path)) end - srv = Yahns::Server.new(cfg) - pid = fork do - ENV["YAHNS_FD"] = @srv.fileno.to_s - srv.start.join - end + pid = mkserver(cfg) gplv3 = File.read("COPYING") Net::HTTP.start(host, port) do |http| res = http.request(Net::HTTP::Get.new("/COPYING")) @@ -47,12 +43,10 @@ class TestServeStatic < Testcase end logger(Logger.new(err.path)) end - pid = fork do - ENV["YAHNS_FD"] = @srv.fileno.to_s + pid = mkserver(cfg) do $_tw_blocked = 0 $_tw_block_on = [1] Yahns::HttpClient.__send__(:include, TrywriteBlocked) - Yahns::Server.new(cfg).start.join end gplv3 = File.read("COPYING") Net::HTTP.start(host, port) do |http| -- cgit v1.2.3-24-ge0c7