Merge lp:~doanac/qa-dashboard/live-status-base into lp:qa-dashboard

[Andy Doan]

This provides the base model and view updates required for live-status of smoke jobs. It adds a new "status" field to results so we can see if they are:

 queued: waiting for jenkins to run the test
 running: jenkins is running the test
 syncing: the test is complete with results, but hasn't made it to the public jenkins (and pulled by our scripts)
 complete: its gone through the pull-script and we have all its job artifacts

This provides the base model and view updates required for live-status of smoke jobs. It adds a new "status" field to results so we can see if they are:

 queued: waiting for jenkins to run the test
 running: jenkins is running the test
 syncing: the test is complete with results, but hasn't made it to the public jenkins (and pulled by our scripts)
 complete: its gone through the pull-script and we have all its job artifacts

[Andy Doan (doanac)]

it might be easier reading commit by commit instead of the full diff.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:689
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/258/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/258/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

I don't really have any issues.. I wouldn't mind http://paste.ubuntu.com/6471885/ being applied though

[Joe Talbott (joetalbott)]

+1

review: Approve

[lp:~doanac/qa-dashboard/live-status-base]

690. By Andy Doan on 2013-11-25

add admin filtering as per chris

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:690
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/259/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/259/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'common/templatetags/dashboard_extras.py'
--- common/templatetags/dashboard_extras.py	2013-10-10 16:11:46 +0000
+++ common/templatetags/dashboard_extras.py	2013-11-25 18:08:44 +0000
@@ -22,6 +22,7 @@
 from common.plugin_helper import ExtensionManager
 
 from smokeng.config import get_internal_jenkins
+from smokeng.models import SmokeResult
 
 register = template.Library()
 
@@ -216,3 +217,15 @@
         jenkins = get_internal_jenkins(variant='')
     jenkins_url = (jenkins + m.group(2) + job + build)
     return jenkins_url
+
+
[e-mail]
+def smokeresult_ran_at(smokeresult):
+    status = smokeresult['status']
+    if status == SmokeResult.COMPLETE:
+        return smokeresult['ran_at']
+    else:
+        for s in SmokeResult.STATUS_CHOICES:
+            if s[0] == status:
+                return s[1]
+    raise RuntimeError('Unexpected smokeresult status: %d' % status)

=== modified file 'common/utils.py'
--- common/utils.py	2013-11-05 22:44:55 +0000
+++ common/utils.py	2013-11-25 18:08:44 +0000
@@ -221,7 +221,7 @@
             image.save()
 
 
-def split_build_number(image):
+def split_build_number(image, save=True):
     if ':' in image.build_number:
         bn_data = image.build_number.split(':')
         bn_parts = len(bn_data)
@@ -241,7 +241,9 @@
     else:
         image.rootfs_id = image.build_number
 
-    image.save()
+    if save:
+        image.save()
+
 
 def txstatsd_interval(metric, append_days=False):
     def dec(func):

=== modified file 'qa_dashboard/settings.py'
--- qa_dashboard/settings.py	2013-11-05 22:44:55 +0000
+++ qa_dashboard/settings.py	2013-11-25 18:08:44 +0000
@@ -190,8 +190,6 @@
     'south',
 )
 
-INSTALLED_APPS = PLUGIN_APPS + LOCAL_APPS + INSTALLED_APPS
-
 TEST_RUNNER = "qa_dashboard.local_tests.LocalAppsTestSuiteRunner"
 
 AUTHENTICATION_BACKENDS = (
@@ -319,3 +317,5 @@
     from debug_settings import *
 except ImportError:
     pass
+
+INSTALLED_APPS = PLUGIN_APPS + LOCAL_APPS + INSTALLED_APPS

=== modified file 'smokeng/admin.py'
--- smokeng/admin.py	2013-08-16 15:20:39 +0000
+++ smokeng/admin.py	2013-11-25 18:08:44 +0000
@@ -36,6 +36,7 @@
     list_display = (
         'image',
         'name',
+        'status',
         'fail_count',
         'error_count',
         'pass_count',
@@ -43,7 +44,7 @@
         'ran_at',
         'publish',
     )
-    list_filter = ['publish', 'name']
+    list_filter = ['publish', 'status', 'name']
     search_fields = ['name']
     date_hierarchy = 'ran_at'
     ordering = ['image']

=== modified file 'smokeng/management/commands/jenkins_pull_smokeng.py'
--- smokeng/management/commands/jenkins_pull_smokeng.py	2013-10-22 16:36:32 +0000
+++ smokeng/management/commands/jenkins_pull_smokeng.py	2013-11-25 18:08:44 +0000
@@ -13,6 +13,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import datetime
 import urllib2
 import re
 import logging
@@ -215,23 +216,27 @@
         result, new_result = SmokeResult.objects.get_or_create(
             image=self.image,
             jenkins_build=self.install_data['jenkins_build'],
-            ran_at=dashboard_data['ran_at'],
             name=self.install_data['test_name'],
             defaults=dict(
+                ran_at=dashboard_data['ran_at'],
                 pass_count=dashboard_data['passes'],
                 fail_count=dashboard_data['failures'],
                 error_count=dashboard_data['errors'],
                 total_count=dashboard_data['total'],
                 pass_rate=pass_rate,
+                status=SmokeResult.COMPLETE,
             )
         )
 
         if not new_result:
+            result.ran_at = datetime.datetime.strptime(
+                dashboard_data['ran_at'], '%Y-%m-%d %H:%M:%S')
             result.pass_count = dashboard_data['passes']
             result.fail_count = dashboard_data['failures']
             result.error_count = dashboard_data['errors']
             result.total_count = dashboard_data['total']
             result.pass_rate = pass_rate
+            result.status = SmokeResult.COMPLETE
             result.save()
 
         all_results = SmokeResult.objects.filter(

=== added file 'smokeng/migrations/0008_auto__add_field_smokeresult_status.py'
--- smokeng/migrations/0008_auto__add_field_smokeresult_status.py	1970-01-01 00:00:00 +0000
+++ smokeng/migrations/0008_auto__add_field_smokeresult_status.py	2013-11-25 18:08:44 +0000
@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'SmokeResult.status'
+        db.add_column('smoke_results', 'status',
+                      self.gf('django.db.models.fields.IntegerField')(default=3),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'SmokeResult.status'
+        db.delete_column('smoke_results', 'status')
+
+
+    models = {
+        u'common.bug': {
+            'Meta': {'object_name': 'Bug', 'db_table': "'bugs'"},
+            'assignee': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'null': 'True'}),
+            'bug_no': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'importance': ('django.db.models.fields.CharField', [], {'default': "u'unknown'", 'max_length': '4096'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'project': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'null': 'True'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "u'unknown'", 'max_length': '4096'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'null': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        u'common.jenkinsbuild': {
+            'Meta': {'unique_together': "(('job', 'build_number'),)", 'object_name': 'JenkinsBuild', 'db_table': "'jenkins_builds'"},
+            'bugs': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'build_bugs'", 'symmetrical': 'False', 'to': u"orm['common.Bug']"}),
+            'build_description': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '4096'}),
+            'build_number': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'failed': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'job': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['common.JenkinsJob']"}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ran_at': ('django.db.models.fields.DateTimeField', [], {}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        u'common.jenkinsjob': {
+            'Meta': {'object_name': 'JenkinsJob', 'db_table': "'jenkins_jobs'"},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '4096'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '4096'})
+        },
+        u'smokeng.smokeimage': {
+            'Meta': {'object_name': 'SmokeImage', 'db_table': "'smoke_images'"},
+            'arch': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'build_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '4096'}),
+            'build_number': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'customization_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '4096'}),
+            'device_specific_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '4096'}),
+            'flavor': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'release': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'rootfs_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '4096'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'variant': ('django.db.models.fields.CharField', [], {'max_length': '4096'})
+        },
+        u'smokeng.smokeresult': {
+            'Meta': {'object_name': 'SmokeResult', 'db_table': "'smoke_results'"},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'error_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'fail_count': ('django.db.models.fields.IntegerField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['smokeng.SmokeImage']"}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'jenkins_build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['common.JenkinsBuild']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'pass_count': ('django.db.models.fields.IntegerField', [], {}),
+            'pass_rate': ('django.db.models.fields.FloatField', [], {'default': '0.0'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ran_at': ('django.db.models.fields.DateTimeField', [], {}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'total_count': ('django.db.models.fields.IntegerField', [], {}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        u'smokeng.smokeresultbug': {
+            'Meta': {'object_name': 'SmokeResultBug', 'db_table': "'smoke_result_bugs'"},
+            'bug': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['common.Bug']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'result': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['smokeng.SmokeResult']"}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        u'smokeng.smoketestresult': {
+            'Meta': {'object_name': 'SmokeTestResult', 'db_table': "'smoke_tests'"},
+            'command': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'command_type': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'internal': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'result': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['smokeng.SmokeResult']"}),
+            'returncode': ('django.db.models.fields.IntegerField', [], {}),
+            'stderr': ('django.db.models.fields.TextField', [], {'null': 'True'}),
+            'stdout': ('django.db.models.fields.TextField', [], {'null': 'True'}),
+            'testcase': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'testsuite': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['smokeng']
\ No newline at end of file

=== modified file 'smokeng/models.py'
--- smokeng/models.py	2013-10-22 17:54:35 +0000
+++ smokeng/models.py	2013-11-25 18:08:44 +0000
@@ -13,6 +13,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import datetime
+
 from django.db import models
 
 from common.models import (
@@ -21,6 +23,8 @@
     JenkinsBuild,
 )
 
+from common.utils import split_build_number
+
 
 class SmokeImage(DashboardBaseModel):
     class Meta:
@@ -41,6 +45,12 @@
     arch = models.CharField(max_length=4096)
     variant = models.CharField(max_length=4096)
 
+    def save(self, **kwargs):
+        '''ensure we have build_number parts'''
+        if not self.build_id:
+            split_build_number(self, False)
+        return super(SmokeImage, self).save(**kwargs)
+
     def __unicode__(self):
         return "{} {} {} {}".format(
             self.release,
@@ -74,6 +84,7 @@
             'total_count',
             'name',
             'ran_at',
+            'status',
             'jenkins_build__job__url',
             'jenkins_build__build_number',
         )
@@ -124,7 +135,8 @@
             if r['total_count']:
                 r['pass_rate'] = float(r['pass_count']) / r['total_count']
             r['pass_rate_pct'] = 100 * r['pass_rate']
-            passrates.append(r['pass_rate'])
+            if r['status'] >= SmokeResult.SYNCING:
+                passrates.append(r['pass_rate'])
 
             for b in bugs:
                 if b['result__id'] == r['id']:
@@ -149,6 +161,19 @@
 class SmokeResult(DashboardBaseModel):
     class Meta:
         db_table = 'smoke_results'
+
+    QUEUED = 0
+    RUNNING = 1
+    SYNCING = 2
+    COMPLETE = 3
+
+    STATUS_CHOICES = (
+        (QUEUED, 'Queued'),
+        (RUNNING, 'Running'),
+        (SYNCING, 'Syncing'),
+        (COMPLETE, 'Complete'),
+    )
+
     image = models.ForeignKey(SmokeImage)
     jenkins_build = models.ForeignKey(JenkinsBuild)
     name = models.CharField(max_length=4096)
@@ -157,8 +182,58 @@
     pass_count = models.IntegerField()
     total_count = models.IntegerField()
     ran_at = models.DateTimeField('date run')
+    status = models.IntegerField(choices=STATUS_CHOICES, default=COMPLETE)
     pass_rate = models.FloatField(default=0.0)
 
+    @staticmethod
+    def create_queued_results(image, build, tests):
+        ran_at = datetime.datetime.now()
+        for test in tests:
+            result, created = SmokeResult.objects.get_or_create(
+                image=image,
+                name=test,
+                defaults={
+                    'fail_count': 0,
+                    'error_count': 0,
+                    'pass_count': 0,
+                    'total_count': 0,
+                    'ran_at': ran_at,
+                    'jenkins_build': build,
+                    'status': SmokeResult.QUEUED,
+                },
+            )
+            if not created:
+                result.status = SmokeResult.QUEUED
+                result.ran_at = ran_at
+                result.jenkins_build = build
+                result.save()
+
+    @staticmethod
+    def set_running(image, build, tests):
+        for test in tests:
+            result = SmokeResult.objects.get(
+                image=image,
+                jenkins_build=build,
+                name=test,
+            )
+            result.ran_at = datetime.datetime.now()
+            result.status = SmokeResult.RUNNING
+            result.save()
+
+    @staticmethod
+    def set_syncing(image, build, test, passes, fails, errors):
+        result = SmokeResult.objects.get(
+            image=image,
+            jenkins_build=build,
+            name=test,
+        )
+        result.status = SmokeResult.SYNCING
+        result.pass_count = passes
+        result.fail_count = fails
+        result.error_count = errors
+        result.total_count = passes + fails + errors
+        result.save()
+
     def __unicode__(self):
         return "{} - {}".format(
             self.name,

=== modified file 'smokeng/tables.py'
--- smokeng/tables.py	2013-09-27 16:55:15 +0000
+++ smokeng/tables.py	2013-11-25 18:08:44 +0000
@@ -63,8 +63,12 @@
         attrs={'td': {'class': 'num'}},
     )
     pass_rate = tables.TemplateColumn(
-        '{% load dashboard_extras %}'
-        '{{ record.pass_rate|decimal_to_percent }}',
+        '''{% load dashboard_extras %}
+        {% if record.inprogress %}
+          Running
+        {% else %}
+        {{ record.pass_rate|decimal_to_percent }}
+        {% endif %}''',
         attrs={'td': {'class': 'num pass_rate_color'}},
     )
     td_class_extra = tables.TemplateColumn(
@@ -127,7 +131,10 @@
             "name": A('name'),
         },
     )
-    ran_at = tables.Column()
+    ran_at = tables.TemplateColumn(
+        '{% load dashboard_extras %}'
+        '{{ record|smokeresult_ran_at }}'
+    )
 
 
 class SmokeKPITable(tables.Table):

=== modified file 'smokeng/tests.py'
--- smokeng/tests.py	2013-11-18 23:04:16 +0000
+++ smokeng/tests.py	2013-11-25 18:08:44 +0000
@@ -467,7 +467,7 @@
             '<li><a href="http://q-jenkins.ubuntu-ci:8080/job/saucy-touch_mir-mako-' +
             'smoke-notes-app-autopilot/1/artifact/clientlogs/utah.yaml/' +
             '*view*/">utah.yaml</a></li>'
-            )
+        )
         _setUp(self)
 
         self.artifact = Artifact.objects.create(
@@ -625,3 +625,146 @@
         page = self._test_result_detail()
         self.assertContains(page, self.private_jenkins_build)
         self.assertContains(page, self.private_jenkins_artifact)
+
+
+class TestSmokeStatus(TestCase):
+    """ Tests for live status operations """
+
+    def setUp(self):
+        _setUp(self)
+
+        # make a basic assumption on what's already in the DB for
+        # tests below
+        self.assertEqual(1, SmokeResult.objects.all().count())
+
+        self.client = Client()
+
+    def _get_results_url(self):
+        return '/smokeng/%s/%s/%s/%s/%d/' % (
+            self.image.release,
+            self.image.variant,
+            self.image.arch,
+            self.image.build_number,
+            self.image.id,
+        )
+
+    def testQueued(self):
+        tests = ['t1', 't2', 't3']
+        SmokeResult.create_queued_results(
+            self.image, self.jenkins_build, tests)
+
+        qs = SmokeResult.objects.filter(status=SmokeResult.QUEUED)
+        self.assertEqual(len(tests), qs.count())
+
+        # ensure pass-rates aren't affected
+        summary = self.image.summary
+        self.assertEqual(3, summary[0]['total_count'])
+        self.assertEqual(1.0 / 3.0, summary[0]['pass_rate'])
+
+        resp = self.client.get('/smokeng/')
+        pass_rate = resp.context[-1]['table'].rows[0]['pass_rate']
+        self.assertEqual(u'Running', pass_rate.strip())
+
+        resp = self.client.get(self._get_results_url())
+        rows = resp.context[-1]['table'].rows
+        for i in range(len(rows)):
+            if i < len(rows) - 1:
+                self.assertEqual('Queued', rows[i]['ran_at'])
+            else:
+                self.assertNotEqual('Queued', rows[i]['ran_at'])
+
+    def testRunning(self):
+        tests = ['t1', 't2', 't3']
+        SmokeResult.create_queued_results(
+            self.image, self.jenkins_build, tests)
+
+        qs = SmokeResult.objects.filter(status=SmokeResult.QUEUED)
+        self.assertEqual(len(tests), qs.count())
+        ran_at = qs[0].ran_at
+
+        # put the first few into running and make sure the counts add up
+        SmokeResult.set_running(self.image, self.jenkins_build, tests[:-1])
+        self.assertEqual(len(tests) + 1, SmokeResult.objects.all().count())
+        qs = SmokeResult.objects.filter(status=SmokeResult.QUEUED)
+        self.assertEqual(1, qs.count())
+        self.assertEqual(ran_at, qs[0].ran_at)
+        qs = SmokeResult.objects.filter(status=SmokeResult.RUNNING)
+        self.assertEqual(len(tests) - 1, qs.count())
+
+        # put the last result into running and make sure the counts add up
+        SmokeResult.set_running(self.image, self.jenkins_build, tests[-1:])
+        self.assertEqual(len(tests) + 1, SmokeResult.objects.all().count())
+        qs = SmokeResult.objects.filter(status=SmokeResult.QUEUED)
+        self.assertEqual(0, qs.count())
+        qs = SmokeResult.objects.filter(status=SmokeResult.RUNNING)
+        self.assertEqual(len(tests), qs.count())
+        self.assertGreater(qs[0].ran_at, ran_at)
+
+        # ensure pass-rates aren't affected
+        self.assertEqual(3, self.image.summary[0]['total_count'])
+        self.assertEqual(1.0 / 3.0, self.image.summary[0]['pass_rate'])
+
+    def testSyncing(self):
+        tests = ['t1', 't2', 't3']
+        SmokeResult.create_queued_results(
+            self.image, self.jenkins_build, tests)
+
+        qs = SmokeResult.objects.filter(status=SmokeResult.QUEUED)
+        self.assertEqual(len(tests), qs.count())
+
+        # put tests into a few states to ensure it can handle them all
+        SmokeResult.set_running(self.image, self.jenkins_build, tests[:-1])
+
+        # this will have wind up with 4 results:
+        # the original from _setup with a pass-rate 33%
+        # t1 = which will be 0, t2 and t3 which will be 33%
+        i = 0
+        for t in tests:
+            SmokeResult.set_syncing(self.image, self.jenkins_build, t, i, i, i)
+            i += 1
+        qs = SmokeResult.objects.filter(status=SmokeResult.SYNCING)
+        self.assertEqual(len(tests), qs.count())
+        self.assertEqual(12, self.image.summary[0]['total_count'])
+        self.assertEqual(.25, self.image.summary[0]['pass_rate'])
+
+        resp = self.client.get('/smokeng/')
+        pass_rate = resp.context[-1]['table'].rows[0]['pass_rate']
+        self.assertEqual(u'25%', pass_rate.strip())
+
+        resp = self.client.get(self._get_results_url())
+        rows = resp.context[-1]['table'].rows
+        for i in range(len(rows)):
+            if i < len(rows) - 1:
+                self.assertEqual('Syncing', rows[i]['ran_at'])
+            else:
+                self.assertNotEqual('Syncing', rows[i]['ran_at'])
+
+    def testRepeat(self):
+        '''Ensure we can move a result back to QUEUED properly.'''
+        tests = ['t1', 't2', 't3']
+        SmokeResult.create_queued_results(
+            self.image, self.jenkins_build, tests)
+
+        # put tests into a few states to ensure it can handle them all
+        # the syncing result bumps up the "total count" by 3 to 6
+        SmokeResult.set_running(self.image, self.jenkins_build, tests[:-1])
+        SmokeResult.set_syncing(self.image, self.jenkins_build,
+                                tests[-1], 1, 1, 1)
+
+        SmokeResult.create_queued_results(
+            self.image, self.jenkins_build, tests)
+
+        # ensure we haven't created new rows:
+        self.assertEqual(len(tests) + 1, SmokeResult.objects.all().count())
+
+        qs = SmokeResult.objects.filter(status=SmokeResult.QUEUED)
+        self.assertEqual(len(tests), qs.count())
+
+        # ensure pass-rates go back properly
+        summary = self.image.summary
+        self.assertEqual(6, summary[0]['total_count'])
+        self.assertEqual(1.0 / 3.0, summary[0]['pass_rate'])
+
+        resp = self.client.get('/smokeng/')
+        pass_rate = resp.context[-1]['table'].rows[0]['pass_rate']
+        self.assertEqual(u'Running', pass_rate.strip())

=== modified file 'smokeng/views.py'
--- smokeng/views.py	2013-10-25 15:48:45 +0000
+++ smokeng/views.py	2013-11-25 18:08:44 +0000
@@ -179,6 +179,9 @@
         if 'ran_at' in result:
             totals[key]['ran_at'] = result['ran_at']
 
+    if result['status'] < SmokeResult.SYNCING:
+        totals[key]['inprogress'] = True
+
     totals[key]['total_count'] += result['total_count']
     totals[key]['pass_count'] += result['pass_count']
     totals[key]['error_count'] += result['error_count']
@@ -222,6 +225,7 @@
         'image__release',
         'name',
         'ran_at',
+        'status',
         'jenkins_build',
     ).annotate(
         pass_count=models.Sum('pass_count'),
@@ -240,6 +244,7 @@
         'image__release',
         'name',
         'ran_at',
+        'status',
         'jenkins_build',
         'pass_count',
         'fail_count',