test after refactor

Author: sshishov

Makefile

@@ -33,15 +33,15 @@ SERVER_PORT ?= 8008
 # Other settings
 DJANGO_SERVER ?= runserver
 DJANGO_SHELL ?= shell_plus
-REPORT_FAILED_TEST ?= report_failed_tests
-REPORT_FAILED_TEST_BRANCHES ?= develop,master
+REPORT_FAILED_TEST_BRANCHES ?= develop,master,test1
 
 # 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
+JIRA_DEFAULT_ASSIGNEE ?= [email protected]
 
 # Setup bootstrapper & Gunicorn args
 has_bootstrapper = $(shell python -m bootstrapper --version 2>&1 | grep -v "No module")
@@ -126,5 +126,5 @@ server: clean pep8
 	LEVEL=$(LEVEL) PYTHONPATH=$(PROJECT) $(GUNICORN) -b $(SERVER_HOST):$(SERVER_PORT) -w $(GUNICORN_WORKERS) -n $(GUNICORN_NAME) -t 60 --graceful-timeout 60 $(gunicorn_args) $(GUNICORN_ARGS) $(PROJECT).wsgi:application
 
 # Reporting of failed cases:
-report_failed_tests:
-	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
+jira_check_tests:
+	ezh-jira-test-checker run_check --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) --jira-default-assignee $(JIRA_DEFAULT_ASSIGNEE) $(COMMAND_ARGS)

circle.yml

@@ -5,6 +5,15 @@ machine:
     DATABASE_URL: postgres://ubuntu:@127.0.0.1:5432/circle_test
     DJANGO_SETTINGS_MODULE: django_and_angular.settings.development
     LEVEL: development
+
+    # JIRA integration
+    REPORT_FAILED_TEST_BRANCHES: develop,master,test1
+    JIRA_ISSUE_TYPE: Bug
+    JIRA_PROJECT_KEY: EZHOME
+    JIRA_SERVER: ezhome-test.atlassin.net
+    JIRA_USERNAME: jira-bot
+    JIRA_PASSWORD: jira-bot
+    JIRA_DEFAULT_ASSIGNEE: [email protected]
   timezone:
     America/Los_Angeles
   node:
@@ -31,7 +40,7 @@ test:
     # - coveralls
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/
     - "[ -r nosetests.xml ] && mv nosetests.xml $CIRCLE_TEST_REPORTS/junit/ || :"
-    - COMMAND_ARGS='--target-branch ${CIRCLE_BRANCH} --test-results ${CIRCLE_TEST_REPORTS}/junit/nosetests.xml' make report_failed_tests
+    - "COMMAND_ARGS='--target-branch ${CIRCLE_BRANCH} --test-results ${CIRCLE_TEST_REPORTS}/junit/nosetests.xml --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) --jira-default-assignee $(JIRA_DEFAULT_ASSIGNEE)' make jira_check_tests || :"
 
 #  # Override /etc/hosts
 #  hosts:

requirements-dev.txt

@@ -1,12 +1,15 @@
+--extra-index-url=http://ezhome-bot:[email protected]/simple/
+
 coverage==4.0
 coveralls==1.0
 django-nose==1.4.2
+# ezhinfra==0.2.? <TBD>
+# temporary solution for being able to check the PR
+-e [email protected]:ezhome/ezh-infrastructure-tools.git@d910af7fdbe2c04e1c258e718e5026992c1ac29d#egg=ezhinfra
 flake8==2.3.0
 flake8-import-order==0.5.3
 flake8-pep257==1.0.3
-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
+flake8-quotes==0.2.4
 nose==1.3.7
 pep257==0.6.0
 pep8==1.6.2

requirements.txt

@@ -8,6 +8,6 @@ drf-nested-routers==0.9.0
 gunicorn==19.1.1
 psycopg2==2.6.1
 raven==5.10.2
-six==1.8.0
+six==1.9.0
 static3==0.5.1
 wsgiref==0.1.2

src/django_and_angular/management/commands/report_failed_tests.py

@@ -67,6 +67,13 @@ class Command(BaseCommand):
             default='nosetests.xml',
             help='Location of test results',
         ),
+        make_option(
+            '--jira-default-assignee',
+            action='store',
+            dest='jira_default_assignee',
+            default='',
+            help='Default assignee for new user',
+        )
     )
 
     def handle(self, *args, **options):
@@ -75,6 +82,7 @@ def handle(self, *args, **options):
         self.jira_server = options['jira_server']
         self.jira_username = options['jira_username']
         self.jira_password = options['jira_password']
+        self.jira_default_assignee = options['jira_default_assignee']
         test_results = options['test_results']
 
         self.repo = Repo()
@@ -103,8 +111,13 @@ def handle(self, *args, **options):
                 results = []
                 for testcase in root:
                     if testcase:
-                        results.append(self.handle_testcase(testcase))
-                return '\n'.join(results)
+                        result = self.handle_testcase(testcase)
+                        if result is not None:
+                            results.append(result)
+                if results:
+                    return '\n'.join(results)
+                else:
+                    return 'No errors in tests'
             else:
                 return 'No errors in tests'
         except IOError:
@@ -184,19 +197,29 @@ def handle_jira(self, path, authors, classname, testcase):
                 )
             else:
                 # Create issue
-                assignee = jira.search_users(
+                assignees = []
+                assignees.extend(jira.search_users(
                     user=authors['function'].email,
                     maxResults=1
-                )
+                ))
+                assignees.extend(jira.search_users(
+                    user=authors['failure'].email,
+                    maxResults=1
+                ))
+                if self.jira_default_assignee:
+                    assignees.extend(jira.search_users(
+                        user=self.jira_default_assignee,
+                        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}
+                if assignees:
+                    issue_dict['assignee'] = {'name': assignees[0].name}
                 new_issue = jira.create_issue(fields=issue_dict)
                 return 'New issue "{0}" has been created'.format(new_issue)
         except JIRAError as e: