From a02dac29f1279296770dc8d1aca8558a85dd76e5 Mon Sep 17 00:00:00 2001
From: Tasawer Nawaz <tasawer.nawaz@arbisoft.com>
Date: Wed, 13 Dec 2017 21:00:27 +0500
Subject: [PATCH] Fix retries logic in award program certificate task
 LEARNER-3165

---
 .../djangoapps/programs/tasks/v1/tasks.py     | 11 ++-----
 .../programs/tasks/v1/tests/test_tasks.py     | 31 -------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/openedx/core/djangoapps/programs/tasks/v1/tasks.py b/openedx/core/djangoapps/programs/tasks/v1/tasks.py
index ff5d8ed673..7734fd25a1 100644
--- a/openedx/core/djangoapps/programs/tasks/v1/tasks.py
+++ b/openedx/core/djangoapps/programs/tasks/v1/tasks.py
@@ -194,14 +194,9 @@ def award_program_certificates(self, username):
                 )
             except Exception:  # pylint: disable=broad-except
                 # keep trying to award other certs, but retry the whole task to fix any missing entries
-                warning_message = 'Failed to award certificate for program {uuid} to user {username}.'.format(
-                    uuid=program_uuid, username=username)
-
-                if countdown < MAX_RETRIES:
-                    LOGGER.warning(warning_message)
-                    retry = True
-                else:
-                    LOGGER.exception("Max retries exceeded. {msg}".format(msg=warning_message))
+                LOGGER.warning('Failed to award certificate for program {uuid} to user {username}.'.format(
+                    uuid=program_uuid, username=username))
+                retry = True
 
         if retry:
             # N.B. This logic assumes that this task is idempotent
diff --git a/openedx/core/djangoapps/programs/tasks/v1/tests/test_tasks.py b/openedx/core/djangoapps/programs/tasks/v1/tests/test_tasks.py
index e857d9c3be..12abb79fa3 100644
--- a/openedx/core/djangoapps/programs/tasks/v1/tests/test_tasks.py
+++ b/openedx/core/djangoapps/programs/tasks/v1/tests/test_tasks.py
@@ -275,37 +275,6 @@ class AwardProgramCertificatesTestCase(CatalogIntegrationMixin, CredentialsApiCo
         mock_info.assert_any_call(mock.ANY, 1, self.student.username)
         mock_info.assert_any_call(mock.ANY, 2, self.student.username)
 
-    @mock.patch(TASKS_MODULE + '.MAX_RETRIES', 0)
-    def test_retries_exceeded(
-        self,
-        mock_get_completed_programs,
-        mock_get_certified_programs,
-        mock_award_program_certificate,
-    ):
-        """
-        Checks that a single failure to award one of several certificates
-        does not cause the entire task to fail.  Also ensures that
-        successfully awarded certs are logged as INFO and exception is logged
-        for failed requests if retires are exceeded.
-        """
-
-        mock_get_completed_programs.return_value = [1, 2]
-        mock_get_certified_programs.side_effect = [[], [2]]
-        mock_award_program_certificate.side_effect = self._make_side_effect([Exception('boom'), None])
-
-        with mock.patch(TASKS_MODULE + '.LOGGER.info') as mock_info, \
-                mock.patch(TASKS_MODULE + '.LOGGER.exception') as mock_exception:
-            tasks.award_program_certificates.delay(self.student.username).get(retries=0)
-
-        self.assertEqual(mock_award_program_certificate.call_count, 2)
-
-        mock_exception.assert_called_once_with(
-            'Max retries exceeded. Failed to award certificate for program {uuid} to user {username}.'.format(
-                uuid=1,
-                username=self.student.username)
-        )
-        mock_info.assert_any_call(mock.ANY, 2, self.student.username)
-
     def test_retry_on_programs_api_errors(
         self,
         mock_get_completed_programs,