From 906724ff074710c7078b2d8423edd2477283b2e1 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 23 Sep 2016 15:54:34 +0200
Subject: test: some very basic functional tests

---
 test/functional/bin_test.rb | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/test/functional/bin_test.rb b/test/functional/bin_test.rb
index bc15e38..ef2d74e 100644
--- a/test/functional/bin_test.rb
+++ b/test/functional/bin_test.rb
@@ -4,19 +4,45 @@ require 'minitest/hell'
 
 class BinTest < Minitest::Test
 
+  def teardown
+    run_command "stop"
+  end
+
   def test_bin_loading
     assert_command_runs("version")
-    assert_equal 0, $?.exitstatus
+  end
+
+  def test_not_running_by_default
+    assert_stopped
+  end
+
+  def test_start
+    run_command "start"
+    assert_running
   end
 
   protected
 
+  def assert_running
+    status = run_command "status"
+    assert_includes status, "Nickserver running"
+  end
+
+  def assert_stopped
+    status = run_command "status"
+    assert_includes status, "No nickserver processes are running."
+  end
+
   def assert_command_runs(command)
-    out = `#{path_to_executable} #{command} 2>&1`
+    out = run_command command
     assert ($?.exitstatus == 0),
       "failed to run 'nickserver #{command}':\n #{out}"
   end
 
+  def run_command(command)
+    `#{path_to_executable} #{command} 2>&1`
+  end
+
   def path_to_executable
     File.expand_path(File.dirname(__FILE__) + '/../../bin/nickserver')
   end
-- 
cgit v1.2.3


From 35433792f9fa23f7b8d9c771d1d3676286a48870 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 23 Sep 2016 15:54:56 +0200
Subject: basic logging and recovery from exceptions raised

---
 lib/nickserver/daemon.rb      |  1 +
 lib/nickserver/reel_server.rb | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/nickserver/daemon.rb b/lib/nickserver/daemon.rb
index 9cc1af7..0f9e7bf 100644
--- a/lib/nickserver/daemon.rb
+++ b/lib/nickserver/daemon.rb
@@ -176,6 +176,7 @@ module Nickserver
         $stdout.reopen(log_path, 'a')
         $stderr.reopen $stdout
         $stdout.sync = true
+        $stderr.sync = true
       else
         # redirect to /dev/null
         $stdin.reopen '/dev/null'
diff --git a/lib/nickserver/reel_server.rb b/lib/nickserver/reel_server.rb
index d2a95ba..9a7053b 100644
--- a/lib/nickserver/reel_server.rb
+++ b/lib/nickserver/reel_server.rb
@@ -23,14 +23,24 @@ module Nickserver
 
     def on_connection(connection)
       connection.each_request do |request|
-        handler = handler_for(request)
-        handler.respond_to params(request), request.headers
+        handle_request(request)
       end
     end
 
 
     protected
 
+    def handle_request(request)
+      puts "#{request.method} #{request.uri}"
+      puts "  #{params(request)}"
+      handler = handler_for(request)
+      handler.respond_to params(request), request.headers
+    rescue StandardError => e
+      puts e
+      puts e.backtrace.join "\n  "
+      request.respond 500, "{}"
+    end
+
     def handler_for(request)
       # with reel the request is the responder
       Dispatcher.new(request)
-- 
cgit v1.2.3


From c32bce3399eb1bca8987a49ecc89700458803250 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 24 Sep 2016 11:56:59 +0200
Subject: test: rename so no name is duplicated

---
 test/integration/dispatcher_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/dispatcher_test.rb b/test/integration/dispatcher_test.rb
index 4f13e6b..4757e83 100644
--- a/test/integration/dispatcher_test.rb
+++ b/test/integration/dispatcher_test.rb
@@ -55,7 +55,7 @@ class Nickserver::DispatcherTest < Minitest::Test
     assert_response success
   end
 
-  def test_email_via_hkp_nicknym_unreachable
+  def test_email_not_found_hkp_nicknym_unreachable
     handle address: ['valid@email.tld'], headers: { "Host" => "http://nickserver.me" }
     stub_nicknym_raises
     hkp_source.expect :query, nil, [Nickserver::EmailAddress]
-- 
cgit v1.2.3


From 5a93f2d29c96e649440101f2d1ca28247631b59e Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 24 Sep 2016 12:00:56 +0200
Subject: use plain http.rb rather than celluloid i/o

Turns out http.rb does not support celluloid i/o andymore and we were not making
use of it anyway.

Here's what https://github.com/httprb/http/wiki/Thread-Safety says:
(NOTE: this gem previously supported Celluloid::IO, but that support was removed to add the current timeout backend. It may be added back in a future version)

So now we have a plain http.rb adapter and use that as the default.
This prevents actors from crashing in the adapter (as we don't have any).
---
 lib/nickserver/adapters/http.rb  | 21 +++++++++++++++++++++
 lib/nickserver/source.rb         |  4 ++--
 test/support/http_stub_helper.rb |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 lib/nickserver/adapters/http.rb

diff --git a/lib/nickserver/adapters/http.rb b/lib/nickserver/adapters/http.rb
new file mode 100644
index 0000000..b0ba728
--- /dev/null
+++ b/lib/nickserver/adapters/http.rb
@@ -0,0 +1,21 @@
+require 'nickserver/adapters'
+require 'nickserver/config'
+require 'http'
+
+module Nickserver::Adapters
+  class Http
+
+    def get(url, options = {})
+      response = HTTP.get url,
+        params: options[:query],
+        ssl_context: ctx
+      return response.code, response.to_s
+    end
+
+    def ctx
+      OpenSSL::SSL::SSLContext.new.tap do |ctx|
+        ctx.ca_file = Nickserver::Config.hkp_ca_file
+      end
+    end
+  end
+end
diff --git a/lib/nickserver/source.rb b/lib/nickserver/source.rb
index edc57e9..ca2c34c 100644
--- a/lib/nickserver/source.rb
+++ b/lib/nickserver/source.rb
@@ -1,9 +1,9 @@
-require 'nickserver/adapters/celluloid_http'
+require 'nickserver/adapters/http'
 
 module Nickserver
   class Source
 
-    def initialize(adapter = Nickserver::Adapters::CelluloidHttp.new)
+    def initialize(adapter = Nickserver::Adapters::Http.new)
       @adapter = adapter
     end
 
diff --git a/test/support/http_stub_helper.rb b/test/support/http_stub_helper.rb
index cb9b578..808fd01 100644
--- a/test/support/http_stub_helper.rb
+++ b/test/support/http_stub_helper.rb
@@ -1,7 +1,7 @@
 module HttpStubHelper
 
   def stubbing_http
-    Nickserver::Adapters::CelluloidHttp.stub :new, adapter do
+    Nickserver::Adapters::Http.stub :new, adapter do
       yield
     end
     adapter.verify
-- 
cgit v1.2.3


From bde67131c2382883f7957fa06d85b471a18c09d4 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 24 Sep 2016 12:12:21 +0200
Subject: log HTTP::ConnectionErrors, respond with json body

---
 lib/nickserver/dispatcher.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/nickserver/dispatcher.rb b/lib/nickserver/dispatcher.rb
index 869f721..07571d5 100644
--- a/lib/nickserver/dispatcher.rb
+++ b/lib/nickserver/dispatcher.rb
@@ -62,9 +62,11 @@ module Nickserver
     end
 
     def proxy_error_response
-      exception = handler_chain.rescued_exceptions.first
-      if exception
-        Nickserver::Response.new(502, exception.to_s)
+      exc = handler_chain.rescued_exceptions.first
+      if exc
+        puts "  Error: #{exc}"
+        Nickserver::Response.new 502,
+          %Q|{"error": "#{exc}"}|
       end
     end
 
-- 
cgit v1.2.3


From 4cd842927a60e4e81915da22983f216ccd54d6a3 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 29 Sep 2016 12:56:14 +0200
Subject: skip tests with ConnectionErrors

We handle these errors nicely in the dispatcher and have tests for that.
Tests should fail or err out when running into exceptions we are not
handling yet. But for these it's better to just skip.
---
 lib/nickserver/dispatcher.rb        | 2 +-
 test/integration/dispatcher_test.rb | 7 ++++++-
 test/remote/celluloid_http_test.rb  | 2 ++
 test/remote/hkp_source_test.rb      | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/nickserver/dispatcher.rb b/lib/nickserver/dispatcher.rb
index 07571d5..f9801d1 100644
--- a/lib/nickserver/dispatcher.rb
+++ b/lib/nickserver/dispatcher.rb
@@ -66,7 +66,7 @@ module Nickserver
       if exc
         puts "  Error: #{exc}"
         Nickserver::Response.new 502,
-          %Q|{"error": "#{exc}"}|
+          JSON.dump(error: exc.to_s)
       end
     end
 
diff --git a/test/integration/dispatcher_test.rb b/test/integration/dispatcher_test.rb
index 4757e83..b551e87 100644
--- a/test/integration/dispatcher_test.rb
+++ b/test/integration/dispatcher_test.rb
@@ -59,7 +59,7 @@ class Nickserver::DispatcherTest < Minitest::Test
     handle address: ['valid@email.tld'], headers: { "Host" => "http://nickserver.me" }
     stub_nicknym_raises
     hkp_source.expect :query, nil, [Nickserver::EmailAddress]
-    assert_response response(status: 502, content: "HTTP::ConnectionError")
+    assert_response http_connection_error
   end
 
   def test_email_via_nicknym
@@ -126,6 +126,11 @@ class Nickserver::DispatcherTest < Minitest::Test
     response status: 500, content: "500 #{msg}\n"
   end
 
+  def http_connection_error
+    response status: 502,
+      content: JSON.dump(error: "HTTP::ConnectionError")
+  end
+
   def response(options)
     Nickserver::Response.new(options[:status], options[:content])
   end
diff --git a/test/remote/celluloid_http_test.rb b/test/remote/celluloid_http_test.rb
index 46a5259..d5d33b4 100644
--- a/test/remote/celluloid_http_test.rb
+++ b/test/remote/celluloid_http_test.rb
@@ -17,6 +17,8 @@ class Nickserver::Adapters::CelluloidHttpTest < Minitest::Test
     url = Nickserver::Config.hkp_url
     status, _body = adapter.get url
     assert_equal 404, status
+  rescue HTTP::ConnectionError => e
+    skip "could not talk to hkp server: #{e}"
   end
 
   protected
diff --git a/test/remote/hkp_source_test.rb b/test/remote/hkp_source_test.rb
index aabc4d3..a4761fb 100644
--- a/test/remote/hkp_source_test.rb
+++ b/test/remote/hkp_source_test.rb
@@ -45,5 +45,7 @@ class RemoteHkpSourceTest < Minitest::Test
       assert_equal 200, status
       yield keys
     end
+  rescue HTTP::ConnectionError => e
+    skip "could not talk to hkp server: #{e}"
   end
 end
-- 
cgit v1.2.3


From 997af2eea91263b1d6c07e02a98f02f81a320acf Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 29 Sep 2016 13:18:38 +0200
Subject: use stderr for errors

---
 lib/nickserver/dispatcher.rb  | 6 +++---
 lib/nickserver/reel_server.rb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/nickserver/dispatcher.rb b/lib/nickserver/dispatcher.rb
index f9801d1..26ad09e 100644
--- a/lib/nickserver/dispatcher.rb
+++ b/lib/nickserver/dispatcher.rb
@@ -40,8 +40,8 @@ module Nickserver
     def handle(request)
       handler_chain.handle request
     rescue RuntimeError => exc
-      puts "Error: #{exc}"
-      puts exc.backtrace
+      $stderr.puts "Error: #{exc}"
+      $stderr.puts exc.backtrace
       ErrorResponse.new(exc.to_s)
     end
 
@@ -64,7 +64,7 @@ module Nickserver
     def proxy_error_response
       exc = handler_chain.rescued_exceptions.first
       if exc
-        puts "  Error: #{exc}"
+        $stderr.puts "  Error: #{exc}"
         Nickserver::Response.new 502,
           JSON.dump(error: exc.to_s)
       end
diff --git a/lib/nickserver/reel_server.rb b/lib/nickserver/reel_server.rb
index 9a7053b..79265ec 100644
--- a/lib/nickserver/reel_server.rb
+++ b/lib/nickserver/reel_server.rb
@@ -36,8 +36,8 @@ module Nickserver
       handler = handler_for(request)
       handler.respond_to params(request), request.headers
     rescue StandardError => e
-      puts e
-      puts e.backtrace.join "\n  "
+      $stderr.puts e
+      $stderr.puts e.backtrace.join "\n  "
       request.respond 500, "{}"
     end
 
-- 
cgit v1.2.3


From 8ee1d1cb70bee8c938966e4e042b4929ced8b1a3 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 30 Sep 2016 11:59:20 +0200
Subject: logging: use proper logger

This way the logs do not interfere with test output
---
 lib/nickserver/dispatcher.rb        |  5 -----
 lib/nickserver/logging_responder.rb | 18 ++++++++++++++++++
 lib/nickserver/reel_server.rb       | 17 ++++++++++++-----
 test/unit/logging_responder_test.rb | 31 +++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 lib/nickserver/logging_responder.rb
 create mode 100644 test/unit/logging_responder_test.rb

diff --git a/lib/nickserver/dispatcher.rb b/lib/nickserver/dispatcher.rb
index 26ad09e..71e71cf 100644
--- a/lib/nickserver/dispatcher.rb
+++ b/lib/nickserver/dispatcher.rb
@@ -39,10 +39,6 @@ module Nickserver
 
     def handle(request)
       handler_chain.handle request
-    rescue RuntimeError => exc
-      $stderr.puts "Error: #{exc}"
-      $stderr.puts exc.backtrace
-      ErrorResponse.new(exc.to_s)
     end
 
     def handler_chain
@@ -64,7 +60,6 @@ module Nickserver
     def proxy_error_response
       exc = handler_chain.rescued_exceptions.first
       if exc
-        $stderr.puts "  Error: #{exc}"
         Nickserver::Response.new 502,
           JSON.dump(error: exc.to_s)
       end
diff --git a/lib/nickserver/logging_responder.rb b/lib/nickserver/logging_responder.rb
new file mode 100644
index 0000000..6eb756f
--- /dev/null
+++ b/lib/nickserver/logging_responder.rb
@@ -0,0 +1,18 @@
+module Nickserver
+  class LoggingResponder
+
+    def initialize(responder, logger)
+      @responder = responder
+      @logger = logger
+    end
+
+    def respond(status, body)
+      logger.info " -> #{status}"
+      responder.respond(status, body)
+    end
+
+    protected
+
+    attr_reader :responder, :logger
+  end
+end
diff --git a/lib/nickserver/reel_server.rb b/lib/nickserver/reel_server.rb
index 79265ec..0ff4425 100644
--- a/lib/nickserver/reel_server.rb
+++ b/lib/nickserver/reel_server.rb
@@ -1,8 +1,11 @@
 silence_warnings do
   require 'reel'
 end
+require 'logger'
+require 'nickserver/config'
 require 'nickserver/adapters/celluloid_http'
 require 'nickserver/dispatcher'
+require 'nickserver/logging_responder'
 
 module Nickserver
   class ReelServer < Reel::Server::HTTP
@@ -31,19 +34,20 @@ module Nickserver
     protected
 
     def handle_request(request)
-      puts "#{request.method} #{request.uri}"
-      puts "  #{params(request)}"
+      logger.info "#{request.method} #{request.uri}"
+      logger.debug "  #{params(request)}"
       handler = handler_for(request)
       handler.respond_to params(request), request.headers
     rescue StandardError => e
-      $stderr.puts e
-      $stderr.puts e.backtrace.join "\n  "
+      logger.error e
+      logger.error e.backtrace.join "\n  "
       request.respond 500, "{}"
     end
 
     def handler_for(request)
       # with reel the request is the responder
-      Dispatcher.new(request)
+      responder = LoggingResponder.new(request, logger)
+      Dispatcher.new(responder)
     end
 
     def params(request)
@@ -54,5 +58,8 @@ module Nickserver
       end
     end
 
+    def logger
+      @logger ||= ::Logger.new Config.log_file
+    end
   end
 end
diff --git a/test/unit/logging_responder_test.rb b/test/unit/logging_responder_test.rb
new file mode 100644
index 0000000..411bc7e
--- /dev/null
+++ b/test/unit/logging_responder_test.rb
@@ -0,0 +1,31 @@
+require 'test_helper'
+require 'nickserver/logging_responder'
+
+module Nickserver
+  class LoggingResponderTest < Minitest::Test
+
+    def test_responds_and_logs
+      logger.expect :info, nil, [" -> 200"]
+      respond_to 200, "body"
+      logger.verify
+    end
+
+    protected
+
+    def respond_to(*args)
+      responder.expect :respond, nil, args
+      logging_responder = LoggingResponder.new responder, logger
+      logging_responder.respond *args
+      responder.verify
+    end
+
+    def responder
+      @responder ||= Minitest::Mock.new
+    end
+
+    def logger
+      @logger ||= Minitest::Mock.new
+    end
+
+  end
+end
-- 
cgit v1.2.3


From 3242f3f2e4eac9e3e38b1ba4da069475872a270b Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 30 Sep 2016 12:03:36 +0200
Subject: logger: log to STDOUT when run in foreground

---
 lib/nickserver/daemon.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/nickserver/daemon.rb b/lib/nickserver/daemon.rb
index 0f9e7bf..12ed30e 100644
--- a/lib/nickserver/daemon.rb
+++ b/lib/nickserver/daemon.rb
@@ -256,6 +256,7 @@ module Nickserver
         puts "\nShutting down..."
         exit(0)
       end
+      Config.log_file = STDOUT
       yield
       exit(0)
     end
-- 
cgit v1.2.3


From 0d4a43cf03f4efeeed1d380c931ab72184346ea1 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 30 Sep 2016 12:46:05 +0200
Subject: minor: test: fix * interpreted as arg prefix warning

---
 test/unit/logging_responder_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/logging_responder_test.rb b/test/unit/logging_responder_test.rb
index 411bc7e..bb6c4a0 100644
--- a/test/unit/logging_responder_test.rb
+++ b/test/unit/logging_responder_test.rb
@@ -15,7 +15,7 @@ module Nickserver
     def respond_to(*args)
       responder.expect :respond, nil, args
       logging_responder = LoggingResponder.new responder, logger
-      logging_responder.respond *args
+      logging_responder.respond(*args)
       responder.verify
     end
 
-- 
cgit v1.2.3


From c3499f703245b6493ddc94d27542a4b49a9bfc81 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 30 Sep 2016 12:46:41 +0200
Subject: logger: log celluloid errors to default log

---
 lib/nickserver/reel_server.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/nickserver/reel_server.rb b/lib/nickserver/reel_server.rb
index 0ff4425..c378aca 100644
--- a/lib/nickserver/reel_server.rb
+++ b/lib/nickserver/reel_server.rb
@@ -15,6 +15,7 @@ module Nickserver
     end
 
     def initialize(host = "127.0.0.1", port = 3000)
+      Celluloid.logger = logger
       super(host, port, &method(:on_connection))
     end
 
-- 
cgit v1.2.3


From ab31d9ca7dca20c873a7240482d1736d0f6b6dae Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 30 Sep 2016 12:47:32 +0200
Subject: change default adapter to CelluloidHttp

Turns out without this nickserver will not respond to multiple concurrent requests.
---
 lib/nickserver/source.rb         | 6 ++++--
 test/support/http_stub_helper.rb | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/nickserver/source.rb b/lib/nickserver/source.rb
index ca2c34c..dc0669a 100644
--- a/lib/nickserver/source.rb
+++ b/lib/nickserver/source.rb
@@ -1,9 +1,11 @@
-require 'nickserver/adapters/http'
+require 'nickserver/adapters/celluloid_http'
 
 module Nickserver
   class Source
 
-    def initialize(adapter = Nickserver::Adapters::Http.new)
+    DEFAULT_ADAPTER_CLASS = Nickserver::Adapters::CelluloidHttp
+
+    def initialize(adapter = DEFAULT_ADAPTER_CLASS.new)
       @adapter = adapter
     end
 
diff --git a/test/support/http_stub_helper.rb b/test/support/http_stub_helper.rb
index 808fd01..dd3d1b2 100644
--- a/test/support/http_stub_helper.rb
+++ b/test/support/http_stub_helper.rb
@@ -1,7 +1,9 @@
+require 'nickserver/source'
+
 module HttpStubHelper
 
   def stubbing_http
-    Nickserver::Adapters::Http.stub :new, adapter do
+    Nickserver::Source::DEFAULT_ADAPTER_CLASS.stub :new, adapter do
       yield
     end
     adapter.verify
-- 
cgit v1.2.3


From 5967c4a568aff2c5e73e3ab933aa68d25387aeb1 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sun, 2 Oct 2016 15:05:02 +0200
Subject: silence Celluloid.logger in tests

Introduced CelluloidTest as a test class for all tests that depend on
Celluloid being up and running.
---
 test/integration/hkp_test.rb            | 11 -----------
 test/integration/nicknym_test.rb        | 11 -----------
 test/integration/nickserver_test.rb     | 16 ++++------------
 test/remote/celluloid_http_test.rb      | 13 ++-----------
 test/remote/hkp_source_test.rb          | 13 ++-----------
 test/remote/nicknym_source_test.rb      | 13 ++-----------
 test/support/celluloid_test.rb          | 14 ++++++++++++++
 test/support/client_integration_test.rb | 13 -------------
 8 files changed, 24 insertions(+), 80 deletions(-)
 delete mode 100644 test/integration/nicknym_test.rb
 create mode 100644 test/support/celluloid_test.rb
 delete mode 100644 test/support/client_integration_test.rb

diff --git a/test/integration/hkp_test.rb b/test/integration/hkp_test.rb
index 7d4bb6b..da128c2 100644
--- a/test/integration/hkp_test.rb
+++ b/test/integration/hkp_test.rb
@@ -5,17 +5,6 @@ require 'nickserver/hkp/source'
 class HkpTest < Minitest::Test
   include HttpStubHelper
 
-  def setup
-    super
-    Celluloid.boot
-  end
-
-  def teardown
-    Celluloid.shutdown
-    super
-  end
-
-
   def test_key_info_expired
     fetch_key_info(:hkp_vindex_result, 'lemur@leap.se') do |keys|
       assert_equal 1, keys.length, 'should find a single key'
diff --git a/test/integration/nicknym_test.rb b/test/integration/nicknym_test.rb
deleted file mode 100644
index bfcd7e1..0000000
--- a/test/integration/nicknym_test.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'test_helper'
-require 'support/client_integration_test'
-require 'nickserver/nicknym/source'
-
-class NicknymClientTest < ClientIntegrationTest
-
-  def test_truth
-    assert true
-  end
-
-end
diff --git a/test/integration/nickserver_test.rb b/test/integration/nickserver_test.rb
index 06d6e29..5dffcd2 100644
--- a/test/integration/nickserver_test.rb
+++ b/test/integration/nickserver_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'support/celluloid_test'
 require 'support/http_stub_helper'
 require 'nickserver/server'
 require 'json'
@@ -15,24 +16,15 @@ require 'json'
 #
 # (1) We mock the http adapter. So no network is required.
 #
-# (2) We actually start the nickserver on 127.0.0.1 and talk to it via http.
+# (2) We actually start the Reelserver on 127.0.0.1 and talk to it via http.
+#     In order to run the Reelserver properly this is a celluloid test.
 #
 # (3) the "Host" header for requests to nickserver must be set (or Config.domain set)
 #
 
-class NickserverTest < Minitest::Test
+class NickserverTest < CelluloidTest
   include HttpStubHelper
 
-  def setup
-    super
-    Celluloid.boot
-  end
-
-  def teardown
-    Celluloid.shutdown
-    super
-  end
-
   def test_GET_key_by_email_address_served_via_SKS
     uid    = 'cloudadmin@leap.se'
     key_id = 'E818C478D3141282F7590D29D041EB11B1647490'
diff --git a/test/remote/celluloid_http_test.rb b/test/remote/celluloid_http_test.rb
index d5d33b4..da5f5d7 100644
--- a/test/remote/celluloid_http_test.rb
+++ b/test/remote/celluloid_http_test.rb
@@ -1,17 +1,8 @@
 require 'test_helper'
+require 'support/celluloid_test'
 require 'nickserver/adapters/celluloid_http'
 
-class Nickserver::Adapters::CelluloidHttpTest < Minitest::Test
-
-  def setup
-    super
-    Celluloid.boot
-  end
-
-  def teardown
-    Celluloid.shutdown
-    super
-  end
+class Nickserver::Adapters::CelluloidHttpTest < CelluloidTest
 
   def test_https_for_hkp
     url = Nickserver::Config.hkp_url
diff --git a/test/remote/hkp_source_test.rb b/test/remote/hkp_source_test.rb
index a4761fb..103b8ad 100644
--- a/test/remote/hkp_source_test.rb
+++ b/test/remote/hkp_source_test.rb
@@ -1,17 +1,8 @@
 require 'test_helper'
+require 'support/celluloid_test'
 require 'nickserver/hkp/source'
 
-class RemoteHkpSourceTest < Minitest::Test
-
-  def setup
-    super
-    Celluloid.boot
-  end
-
-  def teardown
-    Celluloid.shutdown
-    super
-  end
+class RemoteHkpSourceTest < CelluloidTest
 
   def test_key_info
     uid = 'elijah@riseup.net'
diff --git a/test/remote/nicknym_source_test.rb b/test/remote/nicknym_source_test.rb
index b38a991..e2896ca 100644
--- a/test/remote/nicknym_source_test.rb
+++ b/test/remote/nicknym_source_test.rb
@@ -1,21 +1,12 @@
 require 'test_helper'
+require 'support/celluloid_test'
 require 'nickserver/nicknym/source'
 require 'nickserver/email_address'
 
 #
 # Please note the Readme.md file in this directory
 #
-class RemoteNicknymSourceTest < Minitest::Test
-
-  def setup
-    super
-    Celluloid.boot
-  end
-
-  def teardown
-    Celluloid.shutdown
-    super
-  end
+class RemoteNicknymSourceTest < CelluloidTest
 
   def test_availablility_check
     source.available_for? 'mail.bitmask.net'
diff --git a/test/support/celluloid_test.rb b/test/support/celluloid_test.rb
new file mode 100644
index 0000000..ddcfcbb
--- /dev/null
+++ b/test/support/celluloid_test.rb
@@ -0,0 +1,14 @@
+class CelluloidTest < Minitest::Test
+
+  def setup
+    super
+    Celluloid.boot
+    Celluloid.logger = nil
+  end
+
+  def teardown
+    Celluloid.shutdown
+    super
+  end
+
+end
diff --git a/test/support/client_integration_test.rb b/test/support/client_integration_test.rb
deleted file mode 100644
index b05db73..0000000
--- a/test/support/client_integration_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class ClientIntegrationTest
-
-  def setup
-    super
-    Celluloid.boot
-  end
-
-  def teardown
-    Celluloid.shutdown
-    super
-  end
-
-end
-- 
cgit v1.2.3