diff options
| author | Azul <azul@riseup.net> | 2016-10-02 15:05:02 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-10-02 15:05:02 +0200 |
| commit | 5967c4a568aff2c5e73e3ab933aa68d25387aeb1 (patch) | |
| tree | 2edc9f7b40d7b04e4cf739e6e92b200f93cd57e7 /test/integration | |
| parent | ab31d9ca7dca20c873a7240482d1736d0f6b6dae (diff) | |
silence Celluloid.logger in tests
Introduced CelluloidTest as a test class for all tests that depend on
Celluloid being up and running.
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/hkp_test.rb | 11 | ||||
| -rw-r--r-- | test/integration/nicknym_test.rb | 11 | ||||
| -rw-r--r-- | test/integration/nickserver_test.rb | 16 |
3 files changed, 4 insertions, 34 deletions
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' |