Merge branch 'circleci-fixes'

app/logical/pixiv_api_client.rb

@@ -154,10 +154,6 @@ class PixivApiClient
     else
       raise Error.new("Pixiv API call failed (status=#{resp.code} body=#{body})")
     end
-  rescue Net::OpenTimeout
-    print "R" if Rails.env.test?
-    sleep(5)
-    retry
   rescue JSON::ParserError
     raise Error.new("Pixiv API call failed (status=#{resp.code} body=#{body})")
   end
@@ -189,10 +185,5 @@ class PixivApiClient
 
       access_token
     end
-
-  rescue Net::OpenTimeout
-    print "R" if Rails.env.test?
-    sleep(5)
-    retry
   end
 end

app/models/artist.rb

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

app/models/artist_url.rb

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

app/models/bulk_update_request.rb

@@ -118,8 +118,6 @@ class BulkUpdateRequest < ApplicationRecord
         update(forum_post_id: forum_post.id)
       else
         forum_topic = ForumTopic.create(title: title, category_id: 1, original_post_attributes: {body: reason_with_link})
-        puts forum_topic.errors.full_messages
-        puts forum_topic.original_post.errors.full_messages
         update(forum_topic_id: forum_topic.id, forum_post_id: forum_topic.posts.first.id)
       end
     end