Fixed the 404 error with Gitee PR commit and comment

Signed-off-by: Willem Jiang <willem.jiang@gmail.com>

Author: WillemJiang

perceval/backends/core/gitee.py

@@ -370,41 +370,53 @@ def __get_pull_commits(self, pr_number):
         """Get pull request commit hashes"""
 
         hashes = []
-        group_pull_commits = self.client.pull_commits(pr_number)
+        try:
+            group_pull_commits = self.client.pull_commits(pr_number)
 
-        for raw_pull_commits in group_pull_commits:
+            for raw_pull_commits in group_pull_commits:
 
-            for commit in json.loads(raw_pull_commits):
-                commit_hash = commit['sha']
-                hashes.append(commit_hash)
+                for commit in json.loads(raw_pull_commits):
+                    commit_hash = commit['sha']
+                    hashes.append(commit_hash)
 
+        except requests.exceptions.HTTPError as error:
+            # 404 not found is wrongly received from gitee API service
+            if error.response.status_code == 404:
+                logger.error("Can't get gitee pull request commits with PR number %s", pr_number)
+            else:
+                raise error
         return hashes
 
     def __get_pull_review_comments(self, pr_number):
         """Get pull request review comments"""
 
         comments = []
-        group_comments = self.client.pull_review_comments(pr_number)
-
-        for raw_comments in group_comments:
-
-            for comment in json.loads(raw_comments):
-                comment_id = comment.get('id')
-
-                user = comment.get('user', None)
-                if not user:
-                    logger.warning("Missing user info for %s", comment['url'])
-                    comment['user_data'] = None
-                else:
-                    comment['user_data'] = self.__get_user(user['login'])
-                comments.append(comment)
+        try:
+            group_comments = self.client.pull_review_comments(pr_number)
+            for raw_comments in group_comments:
+
+                for comment in json.loads(raw_comments):
+                    comment_id = comment.get('id')
+
+                    user = comment.get('user', None)
+                    if not user:
+                        logger.warning("Missing user info for %s", comment['url'])
+                        comment['user_data'] = None
+                    else:
+                        comment['user_data'] = self.__get_user(user['login'])
+                    comments.append(comment)
+        except requests.exceptions.HTTPError as error:
+            # 404 not found is wrongly received from gitee API service
+            if error.response.status_code == 404:
+                logger.error("Can't get gitee pull request comments with PR number %s", pr_number)
+            else:
+                raise error
 
         return comments
 
     # TODO need to check the Gitee API for the pull reviews
     def __get_pull_reviews(self, pr_number):
         """Get pull request reviews"""
-
         reviews = []
         group_reviews = self.client.pull_reviews(pr_number)
 
@@ -419,6 +431,7 @@ def __get_pull_reviews(self, pr_number):
                     review['user_data'] = self.__get_user(user['login'])
 
                 reviews.append(review)
+
         return reviews
 
     def __get_users(self, items):
@@ -598,24 +611,15 @@ def pull_commits(self, pr_number):
         }
 
         commit_url = urijoin("pulls", str(pr_number), "commits")
-        try:
-            result = self.fetch_items(commit_url, payload)
-        except requests.exceptions.HTTPError as error:
-            # 404 not found is wrongly received sometimes
-            if error.response.status_code == 404:
-                logger.error("Can't get gitee pull commits with : %s", commit_url)
-                result = '[]'
-            else:
-                raise error
-        return result
+        return self.fetch_items(commit_url, payload)
 
     def pull_review_comments(self, pr_number):
         """Get pull request review comments"""
 
         payload = {
             'per_page': PER_PAGE,
             'direction': 'asc',
-            # doesn't suppor sort parameter
+            # doesn't support sort parameter
             # 'sort': 'updated'
         }
 

tests/test_gitee.py

@@ -62,6 +62,15 @@ def setup_gitee_issue_services():
 def setup_gitee_pull_request_services():
     setup_gitee_basic_services()
     __setup_gitee_pull_request_services()
+    __setup_gitee_pull_request_services_with_commits_and_comments()
+    __setup_gitee_pull_request_service_action_logs()
+
+
+def setup_gitee_pull_request_services_with_empty_commits_and_comments():
+    setup_gitee_basic_services()
+    __setup_gitee_pull_request_services()
+    __setup_gitee_pull_request_services_with_empty_commits_and_comments()
+    __setup_gitee_pull_request_service_action_logs()
 
 
 def setup_gitee_basic_services():
@@ -142,6 +151,8 @@ def __setup_gitee_pull_request_services():
                            body=pull_request_2, status=200,
                            forcing_headers=pagination_pull_header_2)
 
+
+def __setup_gitee_pull_request_services_with_commits_and_comments():
     pull_request_1_comments = read_file('data/gitee/gitee_pull_request1_comments')
     httpretty.register_uri(httpretty.GET, GITEE_PULL_REQUEST_1_COMMENTS_URL,
                            body=pull_request_1_comments, status=200,
@@ -178,6 +189,26 @@ def __setup_gitee_pull_request_services():
                            body=pull_request_2_action_logs, status=200)
 
 
+def __setup_gitee_pull_request_services_with_empty_commits_and_comments():
+    httpretty.register_uri(httpretty.GET, GITEE_PULL_REQUEST_1_COMMENTS_URL,
+                           body="", status=404)
+    httpretty.register_uri(httpretty.GET, GITEE_PULL_REQUEST_1_COMMITS_URL,
+                           body="", status=404)
+    httpretty.register_uri(httpretty.GET, GITEE_PULL_REQUEST_2_COMMENTS_URL,
+                           body="", status=404)
+    httpretty.register_uri(httpretty.GET, GITEE_PULL_REQUEST_2_COMMITS_URL,
+                           body="", status=404)
+
+
+def __setup_gitee_pull_request_service_action_logs():
+    pull_request_1_action_logs = read_file('data/gitee/gitee_pull_request1_action_logs')
+    httpretty.register_uri(httpretty.GET, GITEE_PULL_REQUEST_1_OPERATE_LOGS_URL,
+                           body=pull_request_1_action_logs, status=200)
+    pull_request_2_action_logs = read_file('data/gitee/gitee_pull_request2_action_logs')
+    httpretty.register_uri(httpretty.GET, GITEE_PULL_REQUEST_2_OPERATE_LOGS_URL,
+                           body=pull_request_2_action_logs, status=200)
+
+
 def setup_refresh_access_token_service():
     httpretty.register_uri(httpretty.POST, GITEE_REFRESH_TOKEN_URL, body="", status=200)
 
@@ -320,6 +351,31 @@ def test_fetch_pulls(self):
         self.assertEqual(pull['data']['merged_by'], None)
         self.assertEqual(pull['data']['merged_by_data'], [])
 
+    @httpretty.activate
+    def test_fetch_pulls_with_empty_commits_and_comments(self):
+        setup_gitee_pull_request_services_with_empty_commits_and_comments()
+        from_date = datetime.datetime(2019, 1, 1)
+        gitee = Gitee("gitee_example", "repo", "[aaa]")
+        pulls = [pr for pr in gitee.fetch(category=CATEGORY_PULL_REQUEST, from_date=from_date)]
+
+        self.assertEqual(len(pulls), 2)
+        pull = pulls[0]
+        self.assertEqual(len(pull['data']['review_comments_data']), 0)
+        # check if the  testers_data there
+        self.assertTrue('tester_data' not in pull['data'])
+        self.assertEqual(pull['data']['commits_data'], [])
+        self.assertEqual(pull['data']['merged_by'], "willemjiang")
+        self.assertEqual(pull['data']['merged_by_data']['login'], "willemjiang")
+
+        pull = pulls[1]
+        self.assertEqual(len(pull['data']['review_comments_data']), 0)
+        self.assertEqual(len(pull['data']['review_comments_data']), 0)
+        # check if the  testers_data there
+        self.assertTrue('tester_data' not in pull['data'])
+        self.assertEqual(pull['data']['commits_data'], [])
+        self.assertEqual(pull['data']['merged_by'], None)
+        self.assertEqual(pull['data']['merged_by_data'], [])
+
     def test_has_resuming(self):
         """Test if it returns True when has_resuming is called"""