From 8a81429f0eb8aa5041d47557d0c5b5359bb959e6 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 25 May 2016 13:13:30 +0200 Subject: copy over all files from rewritten attempt I started a nickserver from scratch to implement the things that are independent of our choice of stack (eventmachine or other). This commit copies them over and tests both things in parallel. --- test/unit/hkp_test.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'test/unit/hkp_test.rb') diff --git a/test/unit/hkp_test.rb b/test/unit/hkp_test.rb index 0ecde2d..fc3cf97 100644 --- a/test/unit/hkp_test.rb +++ b/test/unit/hkp_test.rb @@ -29,7 +29,7 @@ class HkpTest < Minitest::Test def test_key_info_not_found uid = 'leaping_lemur@leap.se' stub_sks_vindex_reponse(uid, status: 404) - test_em_errback "Nickserver::HKP::FetchKeyInfo.new.search '#{uid}'" do |error| + test_em_errback "Nickserver::Hkp::FetchKeyInfo.new.search '#{uid}'" do |error| assert_equal 404, error end end @@ -37,7 +37,7 @@ class HkpTest < Minitest::Test def test_no_matching_key_found uid = 'leaping_lemur@leap.se' stub_sks_vindex_reponse(uid, status: 200) - test_em_errback "Nickserver::HKP::FetchKeyInfo.new.search '#{uid}'" do |error| + test_em_errback "Nickserver::Hkp::FetchKeyInfo.new.search '#{uid}'" do |error| assert_equal 404, error end end @@ -48,7 +48,7 @@ class HkpTest < Minitest::Test stub_sks_vindex_reponse(uid, body: file_content(:leap_vindex_result)) stub_sks_get_reponse(key_id, body: file_content(:leap_public_key)) - test_em_callback "Nickserver::HKP::FetchKey.new.get '#{uid}'" do |key_text| + test_em_callback "Nickserver::Hkp::FetchKey.new.get '#{uid}'" do |key_text| assert_equal file_content(:leap_public_key), key_text end end @@ -60,7 +60,7 @@ class HkpTest < Minitest::Test stub_sks_vindex_reponse(uid, body: file_content(:leap_vindex_result)) stub_sks_get_reponse(key_id, status: 404) - test_em_errback "Nickserver::HKP::FetchKey.new.get '#{uid}'" do |error| + test_em_errback "Nickserver::Hkp::FetchKey.new.get '#{uid}'" do |error| assert_equal 404, error end end @@ -70,7 +70,7 @@ class HkpTest < Minitest::Test key_id = '9A753A6B' stub_sks_vindex_reponse(uid, body: file_content(:short_key_vindex_result)) - test_em_errback "Nickserver::HKP::FetchKey.new.get '#{uid}'" do |error| + test_em_errback "Nickserver::Hkp::FetchKey.new.get '#{uid}'" do |error| assert_equal 500, error end end @@ -83,7 +83,7 @@ class HkpTest < Minitest::Test def test_key_info_real_network real_network do uid = 'elijah@riseup.net' - test_em_callback "Nickserver::HKP::FetchKeyInfo.new.search '#{uid}'" do |keys| + test_em_callback "Nickserver::Hkp::FetchKeyInfo.new.search '#{uid}'" do |keys| assert_equal 1, keys.size assert keys.first.keyid =~ /00440025$/ end @@ -100,7 +100,7 @@ class HkpTest < Minitest::Test #stub_config(:hkp_ca_file, file_path('autistici-ca.pem')) do assert File.exist?(Nickserver::Config.hkp_ca_file) uid = 'elijah@riseup.net' - test_em_callback "Nickserver::HKP::FetchKeyInfo.new.search '#{uid}'" do |keys| + test_em_callback "Nickserver::Hkp::FetchKeyInfo.new.search '#{uid}'" do |keys| assert_equal 1, keys.size assert keys.first.keyid =~ /00440025$/ end @@ -157,7 +157,7 @@ class HkpTest < Minitest::Test def fetch_key_info(body_source, uid, &block) stub_sks_vindex_reponse(uid, body: file_content(body_source)) - test_em_callback "Nickserver::HKP::FetchKeyInfo.new.search '#{uid}'", &block + test_em_callback "Nickserver::Hkp::FetchKeyInfo.new.search '#{uid}'", &block end end -- cgit v1.2.3 From aed9ae1743eaf433f192a4602b2c6012ffb02a25 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 25 May 2016 14:59:16 +0200 Subject: fix our own warnings --- test/unit/hkp_test.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'test/unit/hkp_test.rb') diff --git a/test/unit/hkp_test.rb b/test/unit/hkp_test.rb index fc3cf97..c315726 100644 --- a/test/unit/hkp_test.rb +++ b/test/unit/hkp_test.rb @@ -67,7 +67,6 @@ class HkpTest < Minitest::Test def test_fetch_key_too_short uid = 'chiiph@leap.se' - key_id = '9A753A6B' stub_sks_vindex_reponse(uid, body: file_content(:short_key_vindex_result)) test_em_errback "Nickserver::Hkp::FetchKey.new.get '#{uid}'" do |error| -- cgit v1.2.3 From b68b025a6d39516a6b4d04dd7c1786df50466d2c Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 9 Jun 2016 11:41:56 +0200 Subject: move hkp test to integration tests That's what it actually is --- test/unit/hkp_test.rb | 162 -------------------------------------------------- 1 file changed, 162 deletions(-) delete mode 100644 test/unit/hkp_test.rb (limited to 'test/unit/hkp_test.rb') diff --git a/test/unit/hkp_test.rb b/test/unit/hkp_test.rb deleted file mode 100644 index c315726..0000000 --- a/test/unit/hkp_test.rb +++ /dev/null @@ -1,162 +0,0 @@ -require File.expand_path('test_helper', File.dirname(__FILE__)) - -class HkpTest < Minitest::Test - - 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' - assert_equal ['lemur@example.org', 'lemur@leap.se'].sort, keys.first.uids.sort, 'should find both uids' - assert_equal '0EE5BE979282D80B9F7540F1CCD2ED94D21739E9', keys.first.keyid - end - end - - def test_key_info_multiple_valid_results - fetch_key_info :hkp_vindex_result, 'gazelle@leap.se' do |keys| - assert_equal 2, keys.length, 'should find two keys' - assert_equal ['gazelle@leap.se'], keys.first.uids - assert_equal '3790027A', keys.first.keyid - assert keys.last.uids.include? 'gazelle@leap.se' - end - end - - def test_key_info_reject_keysize - fetch_key_info :hkp_vindex_result, 'frog@leap.se' do |keys| - assert_equal 1, keys.length, 'should find one key' # because short key gets ignored - assert_equal '00440025', keys.first.keyid - end - end - - def test_key_info_not_found - uid = 'leaping_lemur@leap.se' - stub_sks_vindex_reponse(uid, status: 404) - test_em_errback "Nickserver::Hkp::FetchKeyInfo.new.search '#{uid}'" do |error| - assert_equal 404, error - end - end - - def test_no_matching_key_found - uid = 'leaping_lemur@leap.se' - stub_sks_vindex_reponse(uid, status: 200) - test_em_errback "Nickserver::Hkp::FetchKeyInfo.new.search '#{uid}'" do |error| - assert_equal 404, error - end - end - - def test_fetch_key - uid = 'cloudadmin@leap.se' - key_id = 'E818C478D3141282F7590D29D041EB11B1647490' - stub_sks_vindex_reponse(uid, body: file_content(:leap_vindex_result)) - stub_sks_get_reponse(key_id, body: file_content(:leap_public_key)) - - test_em_callback "Nickserver::Hkp::FetchKey.new.get '#{uid}'" do |key_text| - assert_equal file_content(:leap_public_key), key_text - end - end - - def test_fetch_key_not_found - uid = 'cloudadmin@leap.se' - key_id = 'E818C478D3141282F7590D29D041EB11B1647490' - - stub_sks_vindex_reponse(uid, body: file_content(:leap_vindex_result)) - stub_sks_get_reponse(key_id, status: 404) - - test_em_errback "Nickserver::Hkp::FetchKey.new.get '#{uid}'" do |error| - assert_equal 404, error - end - end - - def test_fetch_key_too_short - uid = 'chiiph@leap.se' - - stub_sks_vindex_reponse(uid, body: file_content(:short_key_vindex_result)) - test_em_errback "Nickserver::Hkp::FetchKey.new.get '#{uid}'" do |error| - assert_equal 500, error - end - end - - # - # real network tests - # remember: must be run with REAL_NET=true - # - - def test_key_info_real_network - real_network do - uid = 'elijah@riseup.net' - test_em_callback "Nickserver::Hkp::FetchKeyInfo.new.search '#{uid}'" do |keys| - assert_equal 1, keys.size - assert keys.first.keyid =~ /00440025$/ - end - end - end - - def test_tls_validation_with_real_network - hkp_url = 'https://keys.mayfirst.org/pks/lookup' - ca_file = file_path('mayfirst-ca.pem') - - real_network do - stub_config(:hkp_url, hkp_url) do - stub_config(:hkp_ca_file, ca_file) do - #stub_config(:hkp_ca_file, file_path('autistici-ca.pem')) do - assert File.exist?(Nickserver::Config.hkp_ca_file) - uid = 'elijah@riseup.net' - test_em_callback "Nickserver::Hkp::FetchKeyInfo.new.search '#{uid}'" do |keys| - assert_equal 1, keys.size - assert keys.first.keyid =~ /00440025$/ - end - end - end - end - end - - protected - - # - # Takes a code snippet that returns a Deferrable, and yields the callback result. - # Assertion fails if errback is called instead of callback. - # - # This method takes care of the calls to EM.run and EM.stop. It works kind of like EM.run_block, - # except I couldn't get run_block to work with multiple nested HTTP requests. - # - def test_em_callback(code, &block) - EM.run do - deferrable = instance_eval(code) - deferrable.callback {|response| - EM.stop - yield response - return - } - deferrable.errback {|response, msg| - EM.stop - puts caller.join("\n") - flunk "Expecting callback, but errback invoked with response: #{response} #{msg}\n\n#{caller.join("\n")}" - } - end - assert false, 'should not get here' - end - - # - # like test_em_callback, except value yielded is the result of errback, and - # we raise an exception if errback was not called. - # - def test_em_errback(code, &block) - EM.run do - deferrable = instance_eval(code) - deferrable.callback {|response| - EM.stop - flunk "Expecting errback, but callback invoked with response: #{response}" - } - deferrable.errback {|response| - EM.stop - yield response - return - } - end - assert false, 'should not get here' - end - - def fetch_key_info(body_source, uid, &block) - stub_sks_vindex_reponse(uid, body: file_content(body_source)) - test_em_callback "Nickserver::Hkp::FetchKeyInfo.new.search '#{uid}'", &block - end - -end -- cgit v1.2.3