From patchwork Wed Nov 9 00:11:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 4958 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 28FCA23E13 for ; Wed, 9 Nov 2011 00:11:19 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 1DD91A1801F for ; Wed, 9 Nov 2011 00:11:19 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so1612530faa.11 for ; Tue, 08 Nov 2011 16:11:19 -0800 (PST) Received: by 10.152.144.73 with SMTP id sk9mr25184lab.34.1320797478640; Tue, 08 Nov 2011 16:11:18 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.14.103 with SMTP id o7cs110467lac; Tue, 8 Nov 2011 16:11:18 -0800 (PST) Received: by 10.180.94.71 with SMTP id da7mr81970wib.29.1320797473846; Tue, 08 Nov 2011 16:11:13 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id u7si1712352wec.132.2011.11.08.16.11.13 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Nov 2011 16:11:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RNvl3-0003LB-Bc for ; Wed, 09 Nov 2011 00:11:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 49D27E04DF for ; Wed, 9 Nov 2011 00:11:13 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dashboard X-Launchpad-Branch: ~linaro-validation/lava-dashboard/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 281 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard/trunk] Rev 281: Merge with trunk Message-Id: <20111109001113.12397.55534.launchpad@ackee.canonical.com> Date: Wed, 09 Nov 2011 00:11:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14263"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 6731bf58bb9d000d7ec5413758faa600b7feb82c 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 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 === 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 @@

Tips

You can download this bundle with the following command:

- lava-dashboard-tool --dashboard-url=http://{{site.domain}}{% url lava.api_handler %} get {{bundle.content_sha1}} + lava-dashboard-tool get --dashboard-url=http://{{site.domain}}{% url lava.api_handler %} {{bundle.content_sha1}}
{% 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