tests: increase mkserver use to reduce LoC

This reduces the amount of code we have in our tests to
improve maintainability.

1 files changed, 6 insertions, 29 deletions

diff --git a/test/test_server.rb b/test/test_server.rb
index d87f617..d10a70e 100644
--- a/test/test_server.rb
+++ b/test/test_server.rb
@@ -18,11 +18,7 @@ class TestServer < Testcase
       GTL.synchronize { app(:rack, ru) { listen "#{host}:#{port}" } }
       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)
     run_client(host, port) { |res| assert_equal "HI", res.body }
     c = get_tcp_client(host, port)
 
@@ -80,11 +76,7 @@ class TestServer < 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)
     c = get_tcp_client(host, port)
     buf = "PUT / HTTP/1.0\r\nContent-Length: 2\r\n\r\nHI"
     c.write(buf)
@@ -159,11 +151,7 @@ class TestServer < 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)
     c = get_tcp_client(host, port)
     buf = "PUT / HTTP/1.0\r\nTrailer:xbt\r\nTransfer-Encoding: chunked\r\n\r\n"
     c.write(buf)
@@ -344,11 +332,7 @@ class TestServer < Testcase
       GTL.synchronize { app(:rack, ru.path) { listen "#{host}:#{port}" } }
       logger(Logger.new(File.open(err.path, "a")))
     end
-    srv = Yahns::Server.new(cfg)
-    pid = fork do
-      ENV["YAHNS_FD"] = @srv.fileno.to_s
-      srv.start.join
-    end
+    pid = mkserver(cfg)
     [ pid, host, port ]
   end
 
@@ -366,11 +350,7 @@ class TestServer < Testcase
       }
       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)
     c = get_tcp_client(host, port)
     c.write("GET / HTTP/1.1\r\nHost: example.com\r\n\r\n")
     buf = Timeout.timeout(10) { c.read }
@@ -401,10 +381,7 @@ class TestServer < Testcase
       stderr_path err.path
       stdout_path out.path
     end
-    pid = fork do
-      ENV["YAHNS_FD"] = @srv.fileno.to_s
-      Yahns::Server.new(cfg).start.join
-    end
+    pid = mkserver(cfg)
     c = get_tcp_client(host, port)
     c.write("GET / HTTP/1.0\r\nHost: example.com\r\n\r\n")
     buf = Timeout.timeout(10) { c.read }