Fix problem with new upstream lmr code for email.

scheduler/scheduler_models.py

 """Database model classes for the scheduler.
 
 Contains model classes abstracting the various DB tables used by the scheduler.
 These overlap the Django models in basic functionality, but were written before
 the Django models existed and have not yet been phased out.  Some of them
 (particularly HostQueueEntry and Job) have considerable scheduler-specific logic
 which would probably be ill-suited for inclusion in the general Django model
 classes.
 
 Globals:
@@ skipping 874 matching lines @@
             return n_test_jobs
 
         stats = {}
 
         rows = _db.execute("""
                 SELECT t.test, s.word, t.reason
                 FROM tko_tests AS t, tko_jobs AS j, tko_status AS s
                 WHERE t.job_idx = j.job_idx
                 AND s.status_idx = t.status
                 AND j.afe_job_id = %s
+                ORDER BY t.reason
                 """ % self.id)
 
         failed_rows = [r for r in rows if not 'GOOD' in r]
 
         n_test_jobs = _find_test_jobs(rows)
         n_test_jobs_failed = _find_test_jobs(failed_rows)
 
         total_executed = len(rows) - n_test_jobs
         total_failed = len(failed_rows) - n_test_jobs_failed
 
@@ skipping 15 matching lines @@
             stats['failed_rows'] = ''
 
         time_row = _db.execute("""
                    SELECT started_time, finished_time
                    FROM tko_jobs
                    WHERE afe_job_id = %s
                    """ % self.id)
 
         if time_row:
             t_begin, t_end = time_row[0]
-            delta = t_end - t_begin
-            minutes, seconds = divmod(delta.seconds, 60)
-            hours, minutes = divmod(minutes, 60)
-            stats['execution_time'] = ("%02d:%02d:%02d" %
-                                       (hours, minutes, seconds))
+            try:
+                delta = t_end - t_begin
+                minutes, seconds = divmod(delta.seconds, 60)
+                hours, minutes = divmod(minutes, 60)
+                stats['execution_time'] = ("%02d:%02d:%02d" %
+                                           (hours, minutes, seconds))
+            # One of t_end or t_begin are None
+            except TypeError:
+                stats['execution_time'] = '(could not determine)'
         else:
             stats['execution_time'] = '(none)'
 
         return stats
 
 
     def set_status(self, status, update_queues=False):
         self.update_field('status',status)
 
         if update_queues:
@@ skipping 359 matching lines @@
     def abort_delay_ready_task(self):
         """Abort the delayed task associated with this job, if any."""
         if self._delay_ready_task:
             # Cancel any pending callback that would try to run again
             # as we are already running.
             self._delay_ready_task.abort()
 
 
     def __str__(self):
         return '%s-%s' % (self.id, self.owner)