diff mbox

[Branch,~linaro-validation/lava-dashboard/trunk] Rev 281: Merge with trunk

Message ID 20111109001113.12397.55534.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki Nov. 9, 2011, 12:11 a.m. UTC 
Merge authors:
  Yongqin Liu (liuyq0307)
  Yongqin Liu (liuyq0307)
  Zygmunt Krynicki (zkrynicki)
Related merge proposals:
  https://code.launchpad.net/~liuyq0307/lava-dashboard/fix-870249/+merge/81229
  proposed by: Yongqin Liu (liuyq0307)
  review: Approve - Yongqin Liu (liuyq0307)
  https://code.launchpad.net/~liuyq0307/lava-dashboard/add-measurement-for-json/+merge/80305
  proposed by: Yongqin Liu (liuyq0307)
  review: Approve - Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 281 [merge]
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: lava-dashboard
timestamp: Wed 2011-11-09 01:02:25 +0100
message:
  Merge with trunk
modified:
  dashboard_app/__init__.py
  dashboard_app/templates/dashboard_app/bundle_detail.html
  dashboard_app/views.py
  doc/changes.rst


--
lp:lava-dashboard
https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk

You are subscribed to branch lp:lava-dashboard.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'dashboard_app/__init__.py'
--- dashboard_app/__init__.py	2011-10-21 00:40:12 +0000
+++ dashboard_app/__init__.py	2011-10-28 18:01:14 +0000
@@ -20,4 +20,4 @@ 
 Dashboard Application (package)
 """
 
-__version__ = (0, 9, 0, "final", 0)
+__version__ = (0, 9, 1, "final", 0)

=== modified file 'dashboard_app/templates/dashboard_app/bundle_detail.html'
--- dashboard_app/templates/dashboard_app/bundle_detail.html	2011-09-27 19:29:01 +0000
+++ dashboard_app/templates/dashboard_app/bundle_detail.html	2011-11-04 03:06:40 +0000
@@ -46,7 +46,7 @@ 
 <h3>Tips</h3>
 <p>You can download this bundle with the following command:</p>
 <div class="console">
-  <code>lava-dashboard-tool --dashboard-url=http://{{site.domain}}{% url lava.api_handler %} get {{bundle.content_sha1}}</code>
+  <code>lava-dashboard-tool get --dashboard-url=http://{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}</code>
 </div>
 {% endblock %}
 

=== modified file 'dashboard_app/views.py'
--- dashboard_app/views.py	2011-11-09 00:00:44 +0000
+++ dashboard_app/views.py	2011-11-09 00:02:25 +0000
@@ -188,10 +188,21 @@ 
     bundle = bundle_stream.bundles.get(content_sha1=content_sha1)
     test_runs = []
     for test_run in bundle.test_runs.all():
+        results = test_run.get_summary_results()
+
+        measurements = [{'item': str(item.test_case),
+                           'measurement': str(item.measurement),
+                           'units': str(item.units)
+                          }
+                for item in test_run.test_results.filter(
+                            measurement__isnull=False).
+                        order_by('test_case__test_case_id')]
+        results['measurements'] = measurements
+
         test_runs.append({
             'name': test_run.test.test_id,
             'url': request.build_absolute_uri(test_run.get_absolute_url()),
-            'results': test_run.get_summary_results()
+            'results': results
             })
     json_text = json.dumps({
         'test_runs':test_runs,

=== modified file 'doc/changes.rst'
--- doc/changes.rst	2011-07-22 01:31:19 +0000
+++ doc/changes.rst	2011-10-28 18:01:14 +0000
@@ -1,6 +1,14 @@ 
 Version History
 ***************
 
+.. _version_0_9_1:
+
+Version 0.9.1
+=============
+
+*  Merge for bug LP:#877859: add measurement information to the json output.
+  This change is used by the Android build service.
+
 .. _version_0_6:
 
 Version 0.6