From 43470bb8dfc48eff7611a4e68f0af4776b26ae2b Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 19 Jun 2014 14:12:04 +0200
Subject: [PATCH] [IMP] runbot: mark killed builds as "killed"

---
 runbot/runbot.py  |  4 ++--
 runbot/runbot.xml | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/runbot/runbot.py b/runbot/runbot.py
index c4d63dec..0c149a27 100644
--- a/runbot/runbot.py
+++ b/runbot/runbot.py
@@ -420,7 +420,7 @@ class runbot_build(osv.osv):
         'author': fields.char('Author'),
         'subject': fields.text('Subject'),
         'sequence': fields.integer('Sequence'),
-        'result': fields.char('Result'), # ok, ko, warn, skipped
+        'result': fields.char('Result'), # ok, ko, warn, skipped, killed
         'pid': fields.integer('Pid'),
         'state': fields.char('Status'), # pending, testing, running, done
         'job': fields.char('Job'), # job_*
@@ -754,7 +754,7 @@ class runbot_build(osv.osv):
                 os.killpg(build.pid, signal.SIGKILL)
             except OSError:
                 pass
-            build.write({'state':'done'})
+            build.write({'state':'done', 'result': 'killed'})
             cr.commit()
             self.pg_dropdb(cr, uid, "%s-base" % build.dest)
             self.pg_dropdb(cr, uid, "%s-all" % build.dest)
diff --git a/runbot/runbot.xml b/runbot/runbot.xml
index 0b82007e..b2ff544d 100644
--- a/runbot/runbot.xml
+++ b/runbot/runbot.xml
@@ -209,8 +209,9 @@
         <t t-if="bu.state=='testing'"><i class="text-info fa fa-spinner"/> testing <t t-esc="bu.job[4:]"/> <small><t t-esc="s2h(bu.job_time)"/></small></t>
         <t t-if="bu.result=='ok'"><i class="text-success fa fa-thumbs-up"/><small> age <t t-esc="s2h(bu.job_age)"/> time <t t-esc="s2h(bu.job_time)"/></small></t>
         <t t-if="bu.result=='ko'"><i class="text-danger fa fa-thumbs-down"/><small> age <t t-esc="s2h(bu.job_age)"/> time <t t-esc="s2h(bu.job_time)"/></small></t>
-        <t t-if="bu.result=='warn'"><i class="text-warning fa fa-thumbs-down"/><small> age <t t-esc="s2h(bu.job_age)"/> time <t t-esc="s2h(bu.job_time)"/></small></t>
+        <t t-if="bu.result=='warn'"><i class="text-warning fa fa-warning"/><small> age <t t-esc="s2h(bu.job_age)"/> time <t t-esc="s2h(bu.job_time)"/></small></t>
         <t t-if="bu.result=='skipped'"><i class="text-danger fa fa-ban"/> skipped</t>
+        <t t-if="bu.result=='killed'"><i class="label-danger fa fa-times"/> killed</t>
     </template>
 
     <template id="runbot.build_button">
@@ -259,6 +260,12 @@
                 <t t-if="refresh">
                     <meta http-equiv="refresh" t-att-content="refresh"/>
                 </t>
+                <style>
+                  .killed {
+                    background-color: #555;
+                    color: #fff;
+                  }
+                </style>
             </t>
             <div class="container" style="width: 100%;">
                 <div class="row">
@@ -345,6 +352,7 @@
                                 <t t-if="bu.state in ['running','done'] and bu.result == 'warn'"><t t-set="klass">warning</t></t>
                                 <t t-if="bu.state in ['running','done'] and bu.result == 'ok'"><t t-set="klass">success</t></t>
                                 <t t-if="bu.state in ['running','done'] and bu.result == 'skipped'"><t t-set="klass">default</t></t>
+                                <t t-if="bu.state in ['running','done'] and bu.result == 'killed'"><t t-set="klass">killed</t></t>
                                 <td t-attf-class="{{klass}}">
                                    <t t-call="runbot.build_button"><t t-set="klass">btn-group-sm</t></t>
                                    <t t-if="bu.subject">