[llvm-commits] [zorg] r147086 - in /zorg/trunk/lnt/lnt: server/ui/templates/v4_order.html server/ui/templates/v4_run.html server/ui/views.py util/NTEmailReport.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed Dec 21 14:00:42 2011
New Revision: 147086

URL: http://llvm.org/viewvc/llvm-project?rev=147086&view=rev
Log:
[lnt/v0.4]: lnt.server.ui/v4: Implement UI access to reports (which themselves still aren't implemented).

Modified:
    zorg/trunk/lnt/lnt/server/ui/templates/v4_order.html
    zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html
    zorg/trunk/lnt/lnt/server/ui/views.py
    zorg/trunk/lnt/lnt/util/NTEmailReport.py

Modified: zorg/trunk/lnt/lnt/server/ui/templates/v4_order.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/templates/v4_order.html?rev=147086&r1=147085&r2=147086&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/templates/v4_order.html (original)
+++ zorg/trunk/lnt/lnt/server/ui/templates/v4_order.html Wed Dec 21 14:00:42 2011
@@ -17,6 +17,10 @@
     </tr>
   </thead>
   <tr>
+    <td>ID</td>
+    <td>{{order.id}}</td>
+  </tr>
+  <tr>
     <td>Ordinal</td>
     <td>{{order.ordinal}}</td>
   </tr>

Modified: zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html?rev=147086&r1=147085&r2=147086&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html (original)
+++ zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html Wed Dec 21 14:00:42 2011
@@ -9,7 +9,6 @@
 {% block head %}
         <script src="{{ url_for('.static', filename='popup.js') }}"></script>
         <script src="{{ url_for('.static', filename='sorttable.js') }}"></script>
-        <script src="{{ url_for('.static', filename='View2D.js') }}"></script>
 {% endblock %}
 
 {% block title %}Run Results{% endblock %}

Modified: zorg/trunk/lnt/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/views.py?rev=147086&r1=147085&r2=147086&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/views.py (original)
+++ zorg/trunk/lnt/lnt/server/ui/views.py Wed Dec 21 14:00:42 2011
@@ -14,6 +14,7 @@
 from flask import url_for
 
 from lnt.db import perfdb
+from lnt.server.ui.globals import v4_url_for
 
 frontend = flask.Module(__name__)
 
@@ -665,8 +666,35 @@
 
     return next_runs[::-1] + [run] + prev_runs
 
+ at v4_route("/<int:id>/report")
+def v4_report(id):
+    db = request.get_db()
+    ts = request.get_testsuite()
+    run = ts.getRun(id)
+
+    _, _, html_report = NTEmailReport.getReport(
+        result=None, db=db, run=run, baseurl=v4_url_for('index'),
+        was_added=True, will_commit=True, only_html_body=False)
+
+    return make_response(html_report)
+
+ at v4_route("/<int:id>/text_report")
+def v4_text_report(id):
+    db = request.get_db()
+    ts = request.get_testsuite()
+    run = ts.getRun(id)
+
+    _, text_report, _ = NTEmailReport.getReport(
+        result=None, db=db, run=run, baseurl=v4_url_for('index'),
+        was_added=True, will_commit=True, only_html_body=True)
+
+    response = make_response(text_report)
+    response.mimetype = "text/plain"
+    return response
+
 @v4_route("/<int:id>")
 def v4_run(id):
+    db = request.get_db()
     ts = request.get_testsuite()
     run = ts.getRun(id)
 
@@ -698,11 +726,17 @@
     else:
         test_filter_re = None
 
-    # FIXME: Include when we have report functionality.
-    _, text_report, html_report = None, "", ""
+    # Generate the report for inclusion in the run page.
+    #
+    # FIXME: This is a crummy implementation of the concept that we want the
+    # webapp UI to be easy to correlate with the email reports.
+    _, text_report, html_report = NTEmailReport.getReport(
+        result=None, db=db, run=run, baseurl=v4_url_for('index'),
+        was_added=True, will_commit=True, only_html_body=True)
 
     return render_template("v4_run.html", ts=ts, run=run,
-                           options=options, neighboring_runs=neighboring_runs)
+                           options=options, neighboring_runs=neighboring_runs,
+                           text_report=text_report, html_report=html_report)
 
 @v4_route("/order/<int:ordinal>")
 def v4_order(ordinal):

Modified: zorg/trunk/lnt/lnt/util/NTEmailReport.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/util/NTEmailReport.py?rev=147086&r1=147085&r2=147086&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/util/NTEmailReport.py (original)
+++ zorg/trunk/lnt/lnt/util/NTEmailReport.py Wed Dec 21 14:00:42 2011
@@ -462,7 +462,8 @@
 
     return subject, report.getvalue(), html_report
 
-def getReport(result, db, run, baseurl, was_added, will_commit):
+def getReport(result, db, run, baseurl, was_added, will_commit,
+              only_html_body = False):
     report = StringIO.StringIO()
 
     # We haven't implemented V4DB support yet in reports.
@@ -472,7 +473,8 @@
     # Use a simple report unless the tag indicates this is an old style nightly
     # test run.
     if 'tag' in run.info and run.info['tag'].value != 'nightlytest':
-        return getSimpleReport(result, db, run, baseurl, was_added, will_commit)
+        return getSimpleReport(result, db, run, baseurl, was_added, will_commit,
+                               only_html_body)
 
     machine = run.machine
     compareTo = None