diff --git a/src/olympia/abuse/cinder.py b/src/olympia/abuse/cinder.py index 121dccddd2c9..77f3c8568763 100644 --- a/src/olympia/abuse/cinder.py +++ b/src/olympia/abuse/cinder.py @@ -168,7 +168,9 @@ def appeal(self, *, decision_cinder_id, appeal_text, appealer): else: raise ConnectionError(response.content) - def _send_create_decision(self, url, data, action, reasoning, policy_uuids): + def _send_create_decision( + self, url, data, action, reasoning, policy_uuids, *, success_code=201 + ): data = { **data, 'reasoning': self.get_str(reasoning), @@ -183,7 +185,7 @@ def _send_create_decision(self, url, data, action, reasoning, policy_uuids): ), } response = requests.post(url, json=data, headers=self.get_cinder_http_headers()) - if response.status_code == 201: + if response.status_code == success_code: return response.json().get('uuid') else: raise ConnectionError(response.content) @@ -208,7 +210,9 @@ def create_override_decision(self, *, action, reasoning, policy_uuids, decision_ # TODO: send action too once # https://lindie.app/share/6a21d831b39351d7c6fe898f6d22619af62dde98/PLAT-1834 # implements the same parameters for overrides - return self._send_create_decision(url, {}, None, reasoning, policy_uuids) + return self._send_create_decision( + url, {}, None, reasoning, policy_uuids, success_code=200 + ) def close_job(self, *, job_id): url = f'{settings.CINDER_SERVER_URL}jobs/{job_id}/cancel' diff --git a/src/olympia/abuse/tests/test_cinder.py b/src/olympia/abuse/tests/test_cinder.py index 3e98d8bf1fb4..f1c28720a336 100644 --- a/src/olympia/abuse/tests/test_cinder.py +++ b/src/olympia/abuse/tests/test_cinder.py @@ -1446,7 +1446,7 @@ def test_create_override_decision(self): responses.POST, f'{settings.CINDER_SERVER_URL}decisions/{overridden_decision_id}/override/', json={'uuid': cinder_id}, - status=201, + status=200, ) responses.add( responses.POST, diff --git a/src/olympia/abuse/tests/test_models.py b/src/olympia/abuse/tests/test_models.py index eb95358e9925..c3fe0a5dab56 100644 --- a/src/olympia/abuse/tests/test_models.py +++ b/src/olympia/abuse/tests/test_models.py @@ -2688,7 +2688,7 @@ def _test_report_to_cinder( responses.POST, f'{settings.CINDER_SERVER_URL}decisions/{overridden_id}/override/', json={'uuid': uuid.uuid4().hex}, - status=201, + status=200, ) decision.policies.add( CinderPolicy.objects.create(name='policy', uuid='12345678') diff --git a/src/olympia/reviewers/tests/test_commands.py b/src/olympia/reviewers/tests/test_commands.py index 375b7475b486..030df10480f0 100644 --- a/src/olympia/reviewers/tests/test_commands.py +++ b/src/olympia/reviewers/tests/test_commands.py @@ -1464,7 +1464,7 @@ def test_reject_versions_with_resolved_cinder_job(self): responses.POST, f'{settings.CINDER_SERVER_URL}decisions/13579/override/', json={'uuid': uuid.uuid4().hex}, - status=201, + status=200, ) policies = [CinderPolicy.objects.create(name='policy', uuid='12345678')] review_action_reason = ReviewActionReason.objects.create( @@ -1509,7 +1509,7 @@ def test_reject_versions_with_resolved_cinder_job_no_third_party(self): responses.POST, f'{settings.CINDER_SERVER_URL}decisions/13579/override/', json={'uuid': uuid.uuid4().hex}, - status=201, + status=200, ) policies = [CinderPolicy.objects.create(name='policy', uuid='12345678')] review_action_reason = ReviewActionReason.objects.create( @@ -1554,7 +1554,7 @@ def test_reject_versions_with_multiple_delayed_rejections(self): responses.POST, f'{settings.CINDER_SERVER_URL}decisions/13579/override/', json={'uuid': uuid.uuid4().hex}, - status=201, + status=200, ) policies = [CinderPolicy.objects.create(name='policy', uuid='12345678')] review_action_reason = ReviewActionReason.objects.create( diff --git a/src/olympia/reviewers/tests/test_views.py b/src/olympia/reviewers/tests/test_views.py index c73c14878cf9..689ff85ccebd 100644 --- a/src/olympia/reviewers/tests/test_views.py +++ b/src/olympia/reviewers/tests/test_views.py @@ -7556,7 +7556,7 @@ def test_approve_addon_instead(self): responses.POST, f'{settings.CINDER_SERVER_URL}decisions/{self.decision.cinder_id}/override/', json={'uuid': '5678'}, - status=201, + status=200, ) response = self.client.post(self.url, {'choice': 'no'})