Merge pull request #66 from fedora-infra/feature/retirement-tweaks

Some changes to the retirement handler...

Author: mprahl

pdcupdater/handlers/retirement.py

@@ -3,6 +3,7 @@
 import requests
 
 import pdcupdater.services
+import pdcupdater.utils
 
 log = logging.getLogger(__name__)
 
@@ -54,17 +55,7 @@ def handle(self, pdc, msg):
         if branch['active'] is False:
             return
 
-        self._retire_branch(pdc, branch)
-
-    @staticmethod
-    def _retire_branch(pdc, branch):
-        """ Internal method for retiring a branch in PDC. """
-        today = datetime.utcnow().date()
-        for sla in branch['slas']:
-            sla_eol = datetime.strptime(sla['eol'], '%Y-%m-%d').date()
-            if sla_eol > today:
-                pdc['component-branch-slas'][sla['id']]._ \
-                    += {'eol': str(today)}
+        _retire_branch(pdc, branch)
 
     @staticmethod
     def _namespace_to_pdc(namespace):
@@ -96,31 +87,6 @@ def _pdc_to_namespace(pdc_type):
         else:
             return pdc_to_namespace[pdc_type]
 
-    @staticmethod
-    def _is_retired_in_cgit(namespace, repo, branch, requests_session=None):
-        """ Internal method to determine if a branch is retired in cgit. """
-        if requests_session is None:
-            requests_session = requests.Session()
-
-        cgit_url = 'https://src.fedoraproject.org/cgit'
-        # Check to see if they have a dead.package file in dist-git
-        url = '{base}/{namespace}/{repo}.git/plain/dead.package?h={branch}'
-        response = requests_session.head(url.format(
-            base=cgit_url,
-            namespace=namespace,
-            repo=repo,
-            branch=branch,
-        ))
-
-        # If there is a dead.package, then the branch is retired in cgit
-        if response.status_code in [200, 404]:
-            return response.status_code == 200
-        else:
-            raise ValueError(
-                'The connection to cgit failed. Retirement status could not '
-                'be determined. The status code was: {0}. The content was: '
-                '{1}'.format(response.status_code, response.content))
-
     def audit(self, pdc):
         """ Returns the difference in retirement status in PDC and dist-git.
 
@@ -135,14 +101,14 @@ def audit(self, pdc):
         for branch in pdc.get_paged(pdc['component-branches']._):
             branch_str = '{type}/{global_component}#{name}'.format(**branch)
             log.debug('Considering {0}'.format(branch_str))
-            retired_in_cgit = self._is_retired_in_cgit(
+            retired_in_dist_git = _is_retired_in_dist_git(
                 namespace=self._pdc_to_namespace(branch['type']),
                 repo=branch['global_component'],
                 branch=branch['name'],
                 requests_session=session
             )
 
-            if retired_in_cgit:
+            if retired_in_dist_git:
                 branches_retired_in_distgit.add(branch_str)
             if not branch['active']:
                 branches_retired_in_pdc.add(branch_str)
@@ -166,12 +132,47 @@ def initialize(self, pdc):
         for branch in pdc.get_paged(pdc['component-branches']._, active=True):
             log.debug('Considering {type}/{global_component}#{name}'
                       .format(**branch))
-            retired_in_cgit = self._is_retired_in_cgit(
+            retired_in_dist_git = _is_retired_in_dist_git(
                 namespace=self._pdc_to_namespace(branch['type']),
                 repo=branch['global_component'],
                 branch=branch['name'],
                 requests_session=session
             )
 
-            if retired_in_cgit:
-                self._retire_branch(pdc, branch)
+            if retired_in_dist_git:
+                _retire_branch(pdc, branch)
+
+@pdcupdater.utils.retry(wait_on=requests.exceptions.ConnectionError)
+def _is_retired_in_dist_git(namespace, repo, branch, requests_session=None):
+    if requests_session is None:
+        requests_session = requests.Session()
+
+    base = 'https://src.fedoraproject.org/'
+    # Check to see if they have a dead.package file in dist-git
+    url = '{base}/{namespace}/{repo}/raw/{branch}/f/dead.package'
+    response = requests_session.head(url.format(
+        base=base,
+        namespace=namespace,
+        repo=repo,
+        branch=branch,
+    ))
+
+    # If there is a dead.package, then the branch is retired in dist_git
+    if response.status_code in [200, 404]:
+        return response.status_code == 200
+    else:
+        raise ValueError(
+            'The connection to dist_git failed. Retirement status could not '
+            'be determined. The status code was: {0}. The content was: '
+            '{1}'.format(response.status_code, response.content))
+
+
+@pdcupdater.utils.retry(wait_on=requests.exceptions.ConnectionError)
+def _retire_branch(pdc, branch):
+    """ Internal method for retiring a branch in PDC. """
+    today = datetime.utcnow().date()
+    for sla in branch['slas']:
+        sla_eol = datetime.strptime(sla['eol'], '%Y-%m-%d').date()
+        if sla_eol > today:
+            pdc['component-branch-slas'][sla['id']]._ \
+                += {'eol': str(today)}

pdcupdater/tests/handler_tests/test_retirement.py

@@ -2,6 +2,7 @@
 
 from pdcupdater.tests.handler_tests import BaseHandlerTest, mock_pdc
 import pdcupdater.services
+import pdcupdater.handlers.retirement
 from pdcupdater.handlers.retirement import RetireComponentHandler
 
 
@@ -178,7 +179,7 @@ def test_audit(self, pdc):
 
 
     @mock_pdc
-    def test_audit_retired_in_pdc_not_cgit(self, pdc):
+    def test_audit_retired_in_pdc_not_git(self, pdc):
         pdc.add_endpoint('component-branches', 'GET', [
             {
                 "id": 155867,
@@ -234,7 +235,7 @@ def test_audit_retired_in_pdc_not_cgit(self, pdc):
         self.assertEquals(absent, set())
 
     @mock_pdc
-    def test_audit_retired_in_cgit_not_pdc(self, pdc):
+    def test_audit_retired_in_git_not_pdc(self, pdc):
         pdc.add_endpoint('component-branches', 'GET', [
             {
                 "id": 155867,
@@ -334,8 +335,8 @@ def test_initialize(self, pdc):
             }
         ])
 
-        with mock.patch.object(RetireComponentHandler, '_retire_branch') as mock_retire_branch, \
-                mock.patch.object(RetireComponentHandler, '_is_retired_in_cgit') as mock_is_retired_in_cgit:
-            mock_is_retired_in_cgit.side_effect = [True, False]
+        with mock.patch.object(pdcupdater.handlers.retirement, '_retire_branch') as mock_retire_branch, \
+                mock.patch.object(pdcupdater.handlers.retirement, '_is_retired_in_dist_git') as mock_is_retired_in_dist_git:
+            mock_is_retired_in_dist_git.side_effect = [True, False]
             self.handler.initialize(pdc)
         self.assertEqual(mock_retire_branch.call_count, 1)