core: remove ProjectStatus creation/update from transaction

Linaro · Sep 27, 2017 · 5cc11cd · 5cc11cd
1 parent a7eb804
commit 5cc11cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/squad/core/tasks/__init__.py b/squad/core/tasks/__init__.py
@@ -226,6 +226,11 @@ def __call__(testrun):
         testrun.status_recorded = True
         testrun.save()
 
+
+class UpdateProjectStatus(object):
+
+    @staticmethod
+    def __call__(testrun):
         projectstatus = ProjectStatus.create_or_update(testrun.build)
         if projectstatus.finished and not projectstatus.notified:
             try:
@@ -248,6 +253,7 @@ class ProcessTestRun(object):
     def __call__(testrun):
         ParseTestRunData()(testrun)
         RecordTestRunStatus()(testrun)
+        UpdateProjectStatus()(testrun)
 
 
 class ProcessAllTestRuns(object):

diff --git a/test/core/test_tasks.py b/test/core/test_tasks.py
@@ -10,6 +10,7 @@
 from squad.core.models import Group, TestRun, Status, Build, ProjectStatus
 from squad.core.tasks import ParseTestRunData
 from squad.core.tasks import RecordTestRunStatus
+from squad.core.tasks import UpdateProjectStatus
 from squad.core.tasks import ProcessTestRun
 from squad.core.tasks import ProcessAllTestRuns
 from squad.core.tasks import ReceiveTestRun
@@ -67,7 +68,6 @@ def test_basics(self):
         self.assertEqual(1, Status.objects.filter(suite__slug='foobar').count())
         self.assertEqual(1, Status.objects.filter(suite__slug='onlytests').count())
         self.assertEqual(1, Status.objects.filter(suite__slug='missing').count())
-        self.assertEqual(1, ProjectStatus.objects.filter(build=self.testrun.build).count())
 
         status = Status.objects.filter(suite=None).last()
         self.assertEqual(status.tests_pass, 2)
@@ -80,12 +80,15 @@ def test_does_not_process_twice(self):
         RecordTestRunStatus()(self.testrun)
         RecordTestRunStatus()(self.testrun)
         self.assertEqual(1, Status.objects.filter(suite=None).count())
-        self.assertEqual(1, ProjectStatus.objects.filter(build=self.testrun.build).count())
+
+
+class UpdateProjectStatusTest(CommonTestCase):
 
     @patch('squad.core.tasks.notify_project_status')
     def test_sends_notification(self, notify_project_status):
         ParseTestRunData()(self.testrun)
         RecordTestRunStatus()(self.testrun)
+        UpdateProjectStatus()(self.testrun)
 
         status = ProjectStatus.objects.last()
         notify_project_status.delay.assert_called_with(status.id)
@@ -96,6 +99,7 @@ def test_do_not_send_dup_notification(self, notified, notify_project_status):
         ParseTestRunData()(self.testrun)
         notified.return_value = True
         RecordTestRunStatus()(self.testrun)
+        UpdateProjectStatus()(self.testrun)
 
         notify_project_status.delay.assert_not_called()
 
@@ -106,6 +110,7 @@ def test_basics(self):
         ProcessTestRun()(self.testrun)
         self.assertEqual(4, self.testrun.tests.count())
         self.assertEqual(5, self.testrun.status.count())
+        self.assertEqual(1, ProjectStatus.objects.filter(build=self.testrun.build).count())
 
 
 class ReceiveTestRunTest(TestCase):