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.
---
 test/remote/celluloid_http_test.rb | 2 ++
 test/remote/hkp_source_test.rb     | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'test/remote')

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 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/remote/celluloid_http_test.rb | 13 ++-----------
 test/remote/hkp_source_test.rb     | 13 ++-----------
 test/remote/nicknym_source_test.rb | 13 ++-----------
 3 files changed, 6 insertions(+), 33 deletions(-)

(limited to 'test/remote')

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'
-- 
cgit v1.2.3