additional error handling in tests

This commit is contained in:
Albert Yi
2018-05-15 17:25:55 -07:00
parent 7ce037a7f1
commit 6acaf999a1
3 changed files with 9 additions and 5 deletions

View File

@@ -484,7 +484,7 @@ class Artist < ApplicationRecord
else
nil
end
rescue Net::OpenTimeout
rescue Net::OpenTimeout, PixivApiClient::Error
raise if Rails.env.test?
nil
rescue Exception

View File

@@ -21,7 +21,7 @@ class ArtistUrl < ApplicationRecord
begin
url = Sources::Site.new(url).normalize_for_artist_finder!
rescue PixivApiClient::Error
rescue Net::OpenTimeout, PixivApiClient::Error
raise if Rails.env.test?
rescue Sources::Site::NoStrategyError
end

View File

@@ -87,9 +87,13 @@ class UploadTest < ActiveSupport::TestCase
end
should "process successfully" do
_, _, output_file = @upload.download_from_source(@url, "")
assert_operator(output_file.size, :>, 1_000)
assert_equal("zip", @upload.file_header_to_file_ext(output_file))
begin
_, _, output_file = @upload.download_from_source(@url, "")
assert_operator(output_file.size, :>, 1_000)
assert_equal("zip", @upload.file_header_to_file_ext(output_file))
rescue Net::OpenTimeout
skip "Remote connection to #{@url} failed"
end
end
end
end