Finishing initial implementation of JIRA integration

sshishov · sshishov · commit d16846c5c08a · 2016-03-04T01:11:27.000+03:00
diff --git a/Makefile b/Makefile
@@ -34,7 +34,14 @@ SERVER_PORT ?= 8008
 DJANGO_SERVER ?= runserver
 DJANGO_SHELL ?= shell_plus
 REPORT_FAILED_TEST ?= report_failed_tests
-REPORT_FAILED_TEST_BRANCHES ?= develop,master,test1
+REPORT_FAILED_TEST_BRANCHES ?= develop,master
+
+# JIRA Settings
+JIRA_ISSUE_TYPE ?= Bug
+JIRA_PROJECT_KEY ?= EZHOME
+JIRA_SERVER ?= https://ezhome-test.atlassian.net
+JIRA_USERNAME ?= jira_bot
+JIRA_PASSWORD ?= P@ssw0rd
 
 # Setup bootstrapper & Gunicorn args
 has_bootstrapper = $(shell python -m bootstrapper --version 2>&1 | grep -v "No module")
@@ -120,4 +127,4 @@ server: clean pep8
 
 # Reporting of failed cases:
 report_failed_tests:
-	COMMAND="$(REPORT_FAILED_TEST) --branches $(REPORT_FAILED_TEST_BRANCHES) $(COMMAND_ARGS)" $(MAKE) manage
+	COMMAND="$(REPORT_FAILED_TEST) --branches $(REPORT_FAILED_TEST_BRANCHES) --issue-type $(JIRA_ISSUE_TYPE) --project-key $(JIRA_PROJECT_KEY) --jira-server $(JIRA_SERVER) --jira-username $(JIRA_USERNAME) --jira-password $(JIRA_PASSWORD) $(COMMAND_ARGS)" $(MAKE) manage
diff --git a/circle.yml b/circle.yml
@@ -25,14 +25,13 @@ dependencies:
 
 test:
   override:
-    - TEST_ARGS='--with-xunit --with-json --json-file="./nosetests.json"' make lint test
+    - TEST_ARGS='--with-xunit' make lint test
 
   post:
     # - coveralls
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/
     - "[ -r nosetests.xml ] && mv nosetests.xml $CIRCLE_TEST_REPORTS/junit/ || :"
-    - "[ -r nosetests.json ] && mv nosetests.json $CIRCLE_TEST_REPORTS/junit/ || :"
-    - COMMAND_ARGS='--target-branch develop' make report_failed_tests
+    - COMMAND_ARGS='--target-branch ${CIRCLE_BRANCH} --test-results ${CIRCLE_TEST_REPORTS}/junit/nosetests.xml' make report_failed_tests
 
 #  # Override /etc/hosts
 #  hosts:
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,10 +4,10 @@ django-nose==1.4.2
 flake8==2.3.0
 flake8-import-order==0.5.3
 flake8-pep257==1.0.3
-GitPython==1.0.2
 https://github.com/zheller/flake8-quotes/tarball/aef86c4f8388e790332757e5921047ad53160a75#egg=flake8-quotes
+GitPython==1.0.2  # For Jira integration
+jira==1.0.3  # For Jira integreation
 nose==1.3.7
-nose-json==0.2.4
 pep257==0.6.0
 pep8==1.6.2
 pep8-naming==0.3.3
diff --git a/src/django_and_angular/management/commands/report_failed_tests.py b/src/django_and_angular/management/commands/report_failed_tests.py
@@ -1,68 +1,203 @@
 import re
-from git import Repo
-
 from optparse import make_option
-
 from xml.etree import cElementTree as ElementTree
 
 from django.core.management.base import BaseCommand
+from git import Repo
+from jira import JIRA
+from jira.exceptions import JIRAError
+
+
+FAILURE_ROW_RE = re.compile(r'\s*File\s"(.*)",\sline\s(.*),.*')
 
 
 class Command(BaseCommand):
 
     help = 'Creates JIRA issues for every failed case for specified branch'
-    result_file = 'nosetests.xml'
-    failure_row_re = re.compile(r'\s*File\s"(.*)",\sline\s(.*),.*')
 
     option_list = BaseCommand.option_list + (
         make_option(
-            '-b',
             '--branches',
             action='store',
             dest='branches',
             help='Affected branches',
         ),
         make_option(
-            '-t',
             '--target-branch',
             action='store',
             dest='target_branch',
             help='Target branch',
-        )
+        ),
+        make_option(
+            '--issue-type',
+            action='store',
+            dest='issue_type',
+            default='Bug',
+            help='Issue type',
+        ),
+        make_option(
+            '--project-key',
+            action='store',
+            dest='project_key',
+            default='EZHOME',
+            help='Project key',
+        ),
+        make_option(
+            '--jira-server',
+            action='store',
+            dest='jira_server',
+            help='JIRA server',
+        ),
+        make_option(
+            '--jira-username',
+            action='store',
+            dest='jira_username',
+            help='Username for JIRA account',
+        ),
+        make_option(
+            '--jira-password',
+            action='store',
+            dest='jira_password',
+            help='Password for JIRA account',
+        ),
+        make_option(
+            '--test-results',
+            action='store',
+            dest='test_results',
+            default='nosetests.xml',
+            help='Location of test results',
+        ),
     )
 
-    @staticmethod
-    def parse_test_path(path):
-        path, classname = path.rsplit('.', 1)
-        path = path.replace('.', '/')
-        return path, classname
-
     def handle(self, *args, **options):
-        repo = Repo()
+        self.issue_type = options['issue_type']
+        self.project_key = options['project_key']
+        self.jira_server = options['jira_server']
+        self.jira_username = options['jira_username']
+        self.jira_password = options['jira_password']
+        test_results = options['test_results']
+
+        self.repo = Repo()
+        branches = []
         try:
-            branches = [repo.heads[x] for x in options['branches'].split(',')]
-            target = repo.heads[options['target_branch']]
-        except IndexError as e:
-            return 'Cannot find branch with error "{0}"'.format(e)
-        if target != repo.head.ref:
-            return 'Current branch "{0}" does not match provided CircleCI branch "{1}"'.format(
-                repo.head.ref, target
+            for branch in options['branches'].split(','):
+                branches.append(self.repo.heads[branch])
+        except IndexError:
+            return 'Cannot find branch "{0}"'.format(branch)
+        try:
+            self.target_branch = self.repo.heads[options['target_branch']]
+        except IndexError:
+            return 'Cannot find branch "{0}"'.format(options['target_branch'])
+        if self.target_branch != self.repo.head.ref:
+            return (
+                'Current branch "{0}" does not match '
+                'provided CircleCI branch "{1}"'
+                .format(self.repo.head.ref, self.target_branch)
             )
-        elif target not in branches:
-            return 'Skipping check for branch "{0}"'.format(repo.head.ref)
+        elif self.target_branch not in branches:
+            return 'Skipping check for branch "{0}"'.format(self.repo.head.ref)
 
         try:
-            root = ElementTree.parse(self.result_file).getroot()
+            root = ElementTree.parse(test_results).getroot()
             if root.attrib['errors']:
+                results = []
                 for testcase in root:
-                    for failure in testcase:
-                        print('Failure for {}'. format(testcase.attrib['name']))
-                        path, classname = self.parse_test_path(testcase.attrib['classname'])
-                        print path, classname
-                        for (file_path, line_number) in re.findall(self.failure_row_re, failure.text):
-                            if path in file_path:
-                                print repo.git.blame('HEAD', file_path)
+                    if testcase:
+                        results.append(self.handle_testcase(testcase))
+                return '\n'.join(results)
             else:
-                return 'No errors'
+                return 'No errors in tests'
         except IOError:
-            return 'File "{0}" does not exist'.format(self.result_file)
+            return 'File "{0}" does not exist'.format(test_results)
+
+    @staticmethod
+    def parse_test_path(path):
+        path, classname = path.rsplit('.', 1)
+        path = path.replace('.', '/')
+        return path, classname
+
+    def handle_testcase(self, testcase):
+        path, classname = self.parse_test_path(
+            testcase.attrib['classname']
+        )
+        for (file_path, line_number) in re.findall(
+                FAILURE_ROW_RE, testcase[0].text
+        ):
+            if path in file_path:
+                # Finding the line of testcase definition
+                authors = {}
+                commit, line = self.repo.blame(
+                    '-L/def {}/'.format(testcase.attrib['name']), file_path
+                )[0]
+                if commit.author not in authors:
+                    authors['function'] = commit.author
+                # Finding the line of failure
+                commit, line = self.repo.blame(
+                    '-L{0},{0}'.format(line_number), file_path
+                )[0]
+                if commit.author not in authors:
+                    authors['failure'] = commit.author
+                return self.handle_jira(
+                    path=path,
+                    authors=authors,
+                    classname=classname,
+                    testcase=testcase,
+                )
+
+    def handle_jira(self, path, authors, classname, testcase):
+        try:
+            jira = JIRA(
+                server=self.jira_server,
+                basic_auth=(
+                    self.jira_username,
+                    self.jira_password,
+                )
+            )
+            summary = (
+                'Fail: {path}:{classname}.{testcase}, '
+                'branch: {branch}'.format(
+                    path=path,
+                    classname=classname,
+                    testcase=testcase.attrib['name'],
+                    branch=self.target_branch,
+                )
+            )
+            open_issues = jira.search_issues(
+                'summary ~ "{summary}" AND '
+                'resolution=unresolved'.format(
+                    summary=summary
+                ),
+                maxResults=1
+            )
+            if open_issues:
+                # Update priority
+                issue = open_issues[0]
+                new_priority = '1'
+                if int(issue.fields.priority.id) > 1:
+                    new_priority = str(int(issue.fields.priority.id) - 1)
+                issue.update(priority={'id': new_priority})
+                return (
+                    'Priority of issue "{issue}" '
+                    'has been set to "{priority}"'.format(
+                        issue=issue, priority=jira.priority(new_priority)
+                    )
+                )
+            else:
+                # Create issue
+                assignee = jira.search_users(
+                    user=authors['function'].email,
+                    maxResults=1
+                )
+                issue_dict = dict(
+                    project={'key': self.project_key},
+                    summary=summary,
+                    issuetype={'name': self.issue_type},
+                    priority={'id': jira.priorities()[-1].id},
+                    description='Description here',
+                )
+                if assignee:
+                    issue_dict['assignee'] = {'name': assignee[0].name}
+                new_issue = jira.create_issue(fields=issue_dict)
+                return 'New issue "{0}" has been created'.format(new_issue)
+        except JIRAError as e:
+            return 'JIRA ERROR: {}'.format(e.text)
