Fixes broadcast tests

bookwyrm/activitypub/base_activity.py

@@ -15,6 +15,7 @@ from django.db.models.query_utils import DeferredAttribute
 from django.utils import timezone
 import requests
 
+from bookwyrm.connectors import ConnectorException, get_data, get_image
 
 class ActivitySerializerError(ValueError):
     ''' routine problems serializing activitypub json '''
@@ -242,20 +243,13 @@ def resolve_remote_id(model, remote_id, refresh=False):
 
     # load the data and create the object
     try:
-        response = requests.get(
+        data = get_data(remote_id)
-            remote_id,
+    except (ConnectorException, ConnectionError):
-            headers={'Accept': 'application/json; charset=utf-8'},
-        )
-    except ConnectionError:
         raise ActivitySerializerError(
             'Could not connect to host for remote_id in %s model: %s' % \
                 (model.__name__, remote_id))
-    if not response.ok:
-        raise ActivitySerializerError(
-            'Could not resolve remote_id in %s model: %s' % \
-                (model.__name__, remote_id))
 
-    item = model.activity_serializer(**response.json())
+    item = model.activity_serializer(**data)
     # if we're refreshing, "result" will be set and we'll update it
     return item.to_model(model, instance=result)
 
@@ -272,11 +266,9 @@ def image_formatter(image_slug):
         return None
     if not url:
         return None
-    try:
+
-        response = requests.get(url)
+    response = get_image(url)
-    except ConnectionError:
+    if not response:
-        return None
-    if not response.ok:
         return None
 
     image_name = str(uuid4()) + '.' + url.split('.')[-1]

bookwyrm/connectors/__init__.py

@@ -1,3 +1,4 @@
 ''' bring connectors into the namespace '''
 from .settings import CONNECTORS
 from .abstract_connector import ConnectorException
+from .abstract_connector import get_data, get_image

bookwyrm/connectors/abstract_connector.py

@@ -318,6 +318,17 @@ def get_data(url):
     return data
 
 
+def get_image(url):
+    ''' wrapper for requesting an image '''
+    try:
+        resp = requests.get(url)
+    except RequestError:
+        return None
+    if not resp.ok:
+        return None
+    return resp
+
+
 @dataclass
 class SearchResult:
     ''' standardized search result object '''

bookwyrm/tests/test_broadcast.py

@@ -1,3 +1,4 @@
+from unittest.mock import patch
 from django.test import TestCase
 
 from bookwyrm import models, broadcast
@@ -37,13 +38,14 @@ class Book(TestCase):
             'joe', 'joe@mouse.mouse', 'jeoword')
         self.user.followers.add(local_follower)
 
-        models.User.objects.create_user(
+        with patch('bookwyrm.models.user.get_remote_reviews.delay'):
-            'nutria', 'nutria@mouse.mouse', 'nuword',
+            models.User.objects.create_user(
-            remote_id='http://example.com/u/4',
+                'nutria', 'nutria@mouse.mouse', 'nuword',
-            outbox='http://example.com/u/4/o',
+                remote_id='http://example.com/u/4',
-            shared_inbox='http://example.com/inbox',
+                outbox='http://example.com/u/4/o',
-            inbox='http://example.com/u/4/inbox',
+                shared_inbox='http://example.com/inbox',
-            local=False)
+                inbox='http://example.com/u/4/inbox',
+                local=False)
 
 
     def test_get_public_recipients(self):