Fixes failing / exception count on validation page (bug 658413)

mozilla · May 19, 2011 · fb54e37 · fb54e37
1 parent 9e38e59
commit fb54e37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/apps/zadmin/models.py b/apps/zadmin/models.py
@@ -55,7 +55,8 @@ class ValidationJob(amo.models.ModelBase):
     creator = models.ForeignKey('users.UserProfile', null=True)
 
     def result_passing(self):
-        return self.result_set.exclude(completed=None).filter(errors=0)
+        return self.result_set.exclude(completed=None).filter(errors=0,
+                                                              task_error=None)
 
     def result_completed(self):
         return self.result_set.exclude(completed=None)
@@ -64,7 +65,7 @@ def result_errors(self):
         return self.result_set.exclude(task_error=None)
 
     def result_failing(self):
-        return self.result_set.exclude(completed=None).exclude(errors=0)
+        return self.result_set.exclude(completed=None).filter(errors__gt=0)
 
     @property
     def preview_success_mail_link(self):
@@ -102,11 +103,12 @@ def _count_stats(self):
         completed = self.result_completed().count()
         passing = self.result_passing().count()
         errors = self.result_errors().count()
+        failing = self.result_failing().count()
         return {
             'total': total,
             'completed': completed,
             'passing': passing,
-            'failing': completed - passing,
+            'failing': failing,
             'errors': errors,
             'percent_complete': (Decimal(completed) / Decimal(total)
                                  * Decimal(100)

diff --git a/apps/zadmin/tests/test_views.py b/apps/zadmin/tests/test_views.py
@@ -560,6 +560,8 @@ def test_task_error(self, run_validator):
         assert close_to_now(res.completed)
         eq_(res.validation_job.stats['total'], 1)
         eq_(res.validation_job.stats['errors'], 1)
+        eq_(res.validation_job.stats['passing'], 0)
+        eq_(res.validation_job.stats['failing'], 0)
 
     @mock.patch('zadmin.tasks.run_validator')
     def test_validate_for_appversions(self, run_validator):
@@ -643,7 +645,7 @@ def test_max_version_override(self, validate):
     def create_version(self, addon, statuses):
         version = Version.objects.create(addon=addon)
         for status in statuses:
-            file = File.objects.create(status=status, version=version)
+            File.objects.create(status=status, version=version)
         return version
 
     def find_files(self):