[Reference PR] VRL - OSF Part

admin_tests/nodes/test_views.py

@@ -546,6 +546,7 @@ def setUp(self):
         self.user = AuthUserFactory()
         self.node = ProjectFactory(creator=self.user)
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_request_approval_is_approved(self):
         now = timezone.now()
         self.approval = RegistrationApprovalFactory(

admin_tests/registrations/test_registrations.py

@@ -92,12 +92,14 @@ def test_embargoed_registration_from_changed_to_private_project_spam_ham(self, e
         embargoed_registration_from_changed_to_private_project.confirm_ham(save=True)
         assert not embargoed_registration_from_changed_to_private_project.is_public
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_public_registration_from_public_project_spam_ham(self, superuser, public_registration_from_public_project):
         public_registration_from_public_project.confirm_spam(save=True)
         assert not public_registration_from_public_project.is_public
         public_registration_from_public_project.confirm_ham(save=True)
         assert public_registration_from_public_project.is_public
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_public_registration_from_private_project_spam_ham(self, superuser, public_registration_from_private_project):
         public_registration_from_private_project.confirm_spam(save=True)
         assert not public_registration_from_private_project.is_public
@@ -110,18 +112,21 @@ def test_private_registration_from_private_project_spam_ham(self, superuser, pri
         private_registration_from_public_project.confirm_ham(save=True)
         assert not private_registration_from_public_project.is_public
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_public_registration_from_changed_to_public_project_spam_ham(self, superuser, public_registration_from_changed_to_public_project):
         public_registration_from_changed_to_public_project.confirm_spam(save=True)
         assert not public_registration_from_changed_to_public_project.is_public
         public_registration_from_changed_to_public_project.confirm_ham(save=True)
         assert public_registration_from_changed_to_public_project.is_public
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_public_registration_from_changed_to_private_project_spam_ham(self, superuser, public_registration_from_changed_to_private_project):
         public_registration_from_changed_to_private_project.confirm_spam(save=True)
         assert not public_registration_from_changed_to_private_project.is_public
         public_registration_from_changed_to_private_project.confirm_ham(save=True)
         assert public_registration_from_changed_to_private_project.is_public
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_unapproved_registration_task(self, embargoed_registration_from_changed_to_public_project):
         embargoed_registration_from_changed_to_public_project.registration_approval.state = 'unapproved'
         embargoed_registration_from_changed_to_public_project.registration_approval.initiation_date -= timedelta(3)
@@ -131,6 +136,7 @@ def test_unapproved_registration_task(self, embargoed_registration_from_changed_
         embargoed_registration_from_changed_to_public_project.registration_approval.refresh_from_db()
         assert embargoed_registration_from_changed_to_public_project.registration_approval.state == 'approved'
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_unapproved_registration_task_after_spam(self, embargoed_registration_from_changed_to_public_project):
         embargoed_registration_from_changed_to_public_project.registration_approval.state = 'unapproved'
         embargoed_registration_from_changed_to_public_project.registration_approval.initiation_date -= timedelta(3)
@@ -141,6 +147,7 @@ def test_unapproved_registration_task_after_spam(self, embargoed_registration_fr
         embargoed_registration_from_changed_to_public_project.registration_approval.refresh_from_db()
         assert embargoed_registration_from_changed_to_public_project.registration_approval.state == 'unapproved'
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_unapproved_registration_task_after_spam_ham(self, embargoed_registration_from_changed_to_public_project):
         embargoed_registration_from_changed_to_public_project.registration_approval.state = 'unapproved'
         embargoed_registration_from_changed_to_public_project.registration_approval.initiation_date -= timedelta(3)

api/share/utils.py

@@ -12,6 +12,7 @@
 from framework.celery_tasks.handlers import enqueue_task
 from framework.encryption import ensure_bytes
 from framework.sentry import log_exception
+from osf.external.gravy_valet.exceptions import GVException
 from osf.metadata.osf_gathering import (
     OsfmapPartition,
     pls_get_magic_metadata_basket,
@@ -78,15 +79,20 @@ def task__update_share(self, guid: str, is_backfill=False, osfmap_partition_name
         raise ValueError(f'unknown osfguid "{guid}"')
     _resource = _osfid_instance.referent
     _is_deletion = _should_delete_indexcard(_resource)
-    _response = (
-        pls_delete_trove_record(_resource, osfmap_partition=_osfmap_partition)
-        if _is_deletion
-        else pls_send_trove_record(
-            _resource,
-            is_backfill=is_backfill,
-            osfmap_partition=_osfmap_partition,
+    try:
+        _response = (
+            pls_delete_trove_record(_resource, osfmap_partition=_osfmap_partition)
+            if _is_deletion
+            else pls_send_trove_record(
+                _resource,
+                is_backfill=is_backfill,
+                osfmap_partition=_osfmap_partition,
+            )
         )
-    )
+    except GVException as e:
+        log_exception(e)
+        raise self.retry(exc=e)
+
     try:
         _response.raise_for_status()
     except Exception as e:

api_tests/identifiers/managment_commands/test_sync_dois.py

@@ -53,6 +53,7 @@ def preprint_identifier(self, preprint):
         identifier.save(update_modified=False)
         return identifier
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     @pytest.mark.enable_enqueue_task
     def test_doi_synced_datacite(self, app, registration, registration_identifier, mock_datacite):
         assert registration_identifier.modified.date() < datetime.datetime.now().date()
@@ -66,6 +67,7 @@ def test_doi_synced_datacite(self, app, registration, registration_identifier, m
         registration_identifier.reload()
         assert registration_identifier.modified.date() == datetime.datetime.now().date()
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     @pytest.mark.enable_enqueue_task
     def test_doi_synced_crossref(self, app, preprint_identifier, mock_crossref):
         assert preprint_identifier.modified.date() < datetime.datetime.now().date()
@@ -77,6 +79,7 @@ def test_doi_synced_crossref(self, app, preprint_identifier, mock_crossref):
         preprint_identifier.reload()
         assert preprint_identifier.modified.date() == datetime.datetime.now().date()
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     @pytest.mark.enable_enqueue_task
     def test_doi_sync_private(self, app, registration_private, registration_identifier, mock_datacite):
 
@@ -91,6 +94,7 @@ def test_doi_sync_private(self, app, registration_private, registration_identifi
         assert registration_identifier.modified.date() < datetime.datetime.now().date()
         assert registration_identifier.modified.date() < datetime.datetime.now().date()
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     @pytest.mark.enable_enqueue_task
     def test_doi_sync_public_only(self, app, registration_private, registration_identifier, mock_datacite):
         call_command('sync_doi_metadata', f'-m={datetime.datetime.now()}')

api_tests/identifiers/views/test_identifier_list.py

@@ -475,6 +475,7 @@ def ark_payload(self):
     def client(self, resource):
         return DataCiteClient(resource)
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     @responses.activate
     def test_create_identifier(self, app, resource, client, identifier_url, identifier_payload, user,
             write_contributor, read_contributor, ark_payload):

api_tests/registrations/views/test_registration_detail.py

@@ -335,6 +335,8 @@ def license_cc0(self):
 @pytest.mark.django_db
 @pytest.mark.enable_implicit_clean
 class TestRegistrationUpdate(TestRegistrationUpdateTestCase):
+
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_update_registration(
             self, app, user, read_only_contributor,
             read_write_contributor, public_registration,
@@ -415,6 +417,7 @@ def test_update_registration(
             expect_errors=True)
         assert res.status_code == 403
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_fields(
             self, app, user, public_registration,
             private_registration, public_url, institution_one,
@@ -561,6 +564,7 @@ def test_fields(
             expect_errors=True)
         assert res.status_code == 400
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_turning_private_registrations_public(
             self, app, user, make_payload):
         private_project = ProjectFactory(creator=user, is_public=False)
@@ -776,6 +780,7 @@ def test_initiate_withdrawal_success(self, mock_send_mail, app, user, public_reg
         assert public_registration.registered_from.logs.first().action == 'retraction_initiated'
         assert mock_send_mail.called
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_initiate_withdrawal_with_embargo_ends_embargo(
             self, app, user, public_project, public_registration, public_url, public_payload):
         public_registration.embargo_registration(
@@ -934,6 +939,7 @@ def new_tag_payload_withdrawn(self, registration_withdrawn):
             }
         }
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_registration_tags(
             self, app, registration_public, registration_private,
             url_registration_public, url_registration_private,

api_tests/registrations/views/test_registrations_childrens_list.py

@@ -68,7 +68,15 @@ def test_registrations_children_list(self, user, app, registration_with_children
         assert component_one._id in ids
         assert component_two._id in ids
 
-    def test_return_registrations_list_no_auth_approved(self, user, app, registration_with_children_approved, registration_with_children_approved_url):
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
+    def test_return_registrations_list_no_auth_approved(
+        self,
+        user,
+        app,
+        registration_with_children_approved,
+        registration_with_children_approved_url
+    ):
+
         component_one, component_two, component_three, component_four = registration_with_children_approved.nodes
 
         res = app.get(registration_with_children_approved_url)

api_tests/registrations/views/test_withdrawn_registrations.py

@@ -224,6 +224,7 @@ def test_field_specific_related_counts_retrieved_if_visible_field_on_withdrawn_r
         assert res.status_code == 200
         assert res.json['data']['relationships']['contributors']['links']['related']['meta']['count'] == 1
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_child_inherits_withdrawal_justification_and_date_withdrawn(
             self, app, user, withdrawn_registration_with_child, registration_with_child):
 

api_tests/registries_moderation/test_submissions.py

@@ -312,6 +312,7 @@ def test_registries_moderation_permission_log(self, app, registration_log_url, r
         resp = app.get(registration_log_url, auth=moderator.auth)
         assert resp.status_code == 200
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_registries_moderation_post_accept(self, app, registration, moderator, registration_actions_url, actions_payload_base, reg_creator):
         registration.require_approval(user=registration.creator)
         registration.registration_approval.accept()
@@ -378,6 +379,7 @@ def test_registries_moderation_post_embargo_reject(self, app, embargo_registrati
         embargo_registration.refresh_from_db()
         assert embargo_registration.moderation_state == RegistrationModerationStates.REJECTED.db_name
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_registries_moderation_post_withdraw_accept(self, app, retract_registration, moderator, retract_registration_actions_url, actions_payload_base, provider):
         retract_registration.sanction.accept()
         retract_registration.refresh_from_db()
@@ -408,6 +410,7 @@ def test_registries_moderation_post_withdraw_reject(self, app, retract_registrat
         retract_registration.refresh_from_db()
         assert retract_registration.moderation_state == RegistrationModerationStates.ACCEPTED.db_name
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_registries_moderation_post_force_withdraw(self, app, registration, moderator, registration_actions_url, actions_payload_base, provider, reg_creator):
         registration.require_approval(user=registration.creator)
         registration.registration_approval.accept()
@@ -477,6 +480,7 @@ def test_registries_moderation_post_embargo_admin_cant_accept(self, app, embargo
         resp = app.post_json_api(embargo_registration_actions_url, actions_payload_base, auth=reg_creator.auth, expect_errors=True)
         assert resp.status_code == 403
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_registries_moderation_post_admin_cant_force_withdraw(self, app, registration, moderator, registration_actions_url, actions_payload_base, provider, reg_creator):
         registration.require_approval(user=registration.creator)
 
@@ -509,6 +513,7 @@ def test_registries_moderation_post_admin_cant_force_withdraw(self, app, registr
             RegistrationModerationTriggers.REJECT_SUBMISSION
         ]
     )
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_post_submission_action_persists_comment(self, app, registration, moderator, registration_actions_url, actions_payload_base, moderator_trigger):
         assert registration.actions.count() == 0
         registration.require_approval(user=registration.creator)
@@ -692,6 +697,7 @@ def test_public_project_with_embargo_is_private_after_spam_and_ham_and_moderatio
         assert registration.moderation_state == RegistrationModerationStates.EMBARGO.db_name
         assert registration.is_public is False
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_private_project_without_embargo_is_public_after_spam_and_ham_and_moderation_approval(self, app, registration, moderator, registration_actions_url, actions_payload_base, provider):
         user = AuthUserFactory()
         user.is_staff = True
@@ -728,6 +734,7 @@ def test_private_project_without_embargo_is_public_after_spam_and_ham_and_modera
         assert registration.moderation_state == RegistrationModerationStates.ACCEPTED.db_name
         assert registration.is_public is True
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_public_project_without_embargo_is_public_after_spam_and_ham_and_moderation_approval(self, app, registration, moderator, registration_actions_url, actions_payload_base, provider):
         user = AuthUserFactory()
         user.is_staff = True

api_tests/search/serializers/test_serializers.py

@@ -16,6 +16,7 @@
 @pytest.mark.django_db
 class TestSearchSerializer:
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_search_serializer_mixed_model(self):
 
         user = AuthUserFactory()

api_tests/search/views/test_views.py

@@ -566,6 +566,7 @@ def registration_private(self, project_private, schema):
             registration_private.update_search()
             return registration_private
 
+    @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
     def test_search_registrations(
             self, app, url_registration_search, user, user_one, user_two,
             registration, registration_public, registration_private):