From 1402aee70280842c17fbd40ca67108ddb0368746 Mon Sep 17 00:00:00 2001
From: Daniel Brown <ddb@star.sr.bham.ac.uk>
Date: Sun, 4 Aug 2013 00:38:21 +0100
Subject: [PATCH] added duration to table
---
pykat/testing/web/templates/finesse_test.html | 3 ++-
pykat/testing/web/templates/finesse_test_view.html | 2 +-
pykat/testing/web/web_interface.py | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/pykat/testing/web/templates/finesse_test.html b/pykat/testing/web/templates/finesse_test.html
index b975e29..e927f78 100644
--- a/pykat/testing/web/templates/finesse_test.html
+++ b/pykat/testing/web/templates/finesse_test.html
@@ -259,7 +259,8 @@
{ "mDataProp": "status", "sTitle": "Status","bSearchable": true, "bVisible": true, "sClass": "center" },
{ "mDataProp": "git_commit", "sTitle": "Git Commit", "bSearchable": true, "bVisible": true, "sClass": "center" },
{ "mDataProp": "startTime", "sTitle": "Start Time", "bSearchable": false, "bVisible": true, "sClass": "center" },
- { "mDataProp": "endTime", "sTitle": "End Time", "bSearchable": false, "bVisible": true, "sClass": "center" }
+ { "mDataProp": "endTime", "sTitle": "End Time", "bSearchable": false, "bVisible": true, "sClass": "center" },
+ { "mDataProp": "duration", "sTitle": "Duration [s]", "bSearchable": false, "bVisible": true, "sClass": "center" }
]
});
}
diff --git a/pykat/testing/web/templates/finesse_test_view.html b/pykat/testing/web/templates/finesse_test_view.html
index f15f08b..240deda 100644
--- a/pykat/testing/web/templates/finesse_test_view.html
+++ b/pykat/testing/web/templates/finesse_test_view.html
@@ -23,7 +23,7 @@
<li>{{ suite }}</li>
<ul>
{% for item in kats[suite] %}
- <li>{{item[0]}} - Max rel diff = {{item[1]}}</li>
+ <li><span style="width: 200px">{{item[0]}}</span> - Max rel diff = {{item[1]}}</li>
{% if item[2][0] != "" %}
<ul>
<li>stdout: <pre>{{item[2][0]}}</pre></li>
diff --git a/pykat/testing/web/web_interface.py b/pykat/testing/web/web_interface.py
index c50298f..27ae5aa 100644
--- a/pykat/testing/web/web_interface.py
+++ b/pykat/testing/web/web_interface.py
@@ -468,11 +468,14 @@ def finesse_get_prev_tests(count):
else:
status = "OK"
+ dt = datetime.strptime(endTime,"%Y-%m-%d %H:%M:%S.%f")-datetime.strptime(startTime,"%Y-%m-%d %H:%M:%S.%f")
+
obj = dict(test_id=i['test_id'],
git_commit=i['git_commit'],
status=status,
startTime=startTime,
- endTime=endTime)
+ endTime=endTime,
+ duration=float(dt.seconds))
rtn.insert(0,obj)
--
GitLab