From patchwork Fri Feb 8 03:38:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Doan X-Patchwork-Id: 14691 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 6DF4B241D2 for ; Fri, 8 Feb 2013 03:38:17 +0000 (UTC) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by fiordland.canonical.com (Postfix) with ESMTP id DC238A18E02 for ; Fri, 8 Feb 2013 03:38:16 +0000 (UTC) Received: by mail-vc0-f176.google.com with SMTP id fk10so85427vcb.35 for ; Thu, 07 Feb 2013 19:38:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:content-type:mime-version:x-launchpad-project :x-launchpad-branch:x-launchpad-message-rationale :x-launchpad-branch-revision-number:x-launchpad-notification-type:to :from:subject:message-id:date:reply-to:sender:errors-to:precedence :x-generated-by:x-launchpad-hash:x-gm-message-state; bh=96n9zgJR5EdPmDKLIzgHmiYVpBxWDyi2MAGvNkD60f8=; b=P6TL8uuOS0hiAyEpPdQydf+MwfL2Oo1fcol4nGnmOs3VJ+FRiAquL5IiT/lunC1TAg 1DHhaKTrz1sG5amfl0TK07zT9OPjBcLwP6QtRoAaRW1irvvtH8DdSCwjl9L3SiKHnU5+ t2o0aEnHAEtUWTVgYW+tZzfI0wf4P8SdhjwE5Yjzj1SCl8Dwtvj/8dZkuim4jxKx3Oin dj8hYL/CsuQnRNkL/FlUAia/SE4yWYkg2tZnk2G03U978h8cSV5yJZIi7qQPjEVCm+HI 54KWZD8/oPtgZKp//i5yFWn5BLAZp814XAfOjzbxWomxMi0MlAIQTGEO9ecn0Hy6ccp4 Vmuw== X-Received: by 10.52.27.50 with SMTP id q18mr4301311vdg.20.1360294696321; Thu, 07 Feb 2013 19:38:16 -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.58.252.8 with SMTP id zo8csp125558vec; Thu, 7 Feb 2013 19:38:15 -0800 (PST) X-Received: by 10.194.76.237 with SMTP id n13mr6835191wjw.57.1360294694713; Thu, 07 Feb 2013 19:38:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fk9si2813808wib.125.2013.02.07.19.38.14 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 07 Feb 2013 19:38:14 -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 1U3emz-00028l-V2 for ; Fri, 08 Feb 2013 03:38:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id D8B05E03DC for ; Fri, 8 Feb 2013 03:38: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: 394 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard/trunk] Rev 394: multiple runs in image-reports now shown properly Message-Id: <20130208033813.24364.5474.launchpad@ackee.canonical.com> Date: Fri, 08 Feb 2013 03:38: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="16482"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 1187efcf9e6a606409b5418cee8436fd3e8dfef8 X-Gm-Message-State: ALoCoQkN103YcOjTaL47vDlA/QXdzaZLfA2nM2aT9I+Cl9KKj5RRPLl17gy68JhMm5YD7dtedyVT Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-dashboard/multiple-runs-of-same-build-number/+merge/147278 proposed by: Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 394 [merge] committer: Andy Doan branch nick: lava-dashboard timestamp: Thu 2013-02-07 21:36:43 -0600 message: multiple runs in image-reports now shown properly modified: dashboard_app/views/images.py --- 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/views/images.py' --- dashboard_app/views/images.py 2012-12-18 00:47:08 +0000 +++ dashboard_app/views/images.py 2013-02-08 02:35:13 +0000 @@ -83,7 +83,7 @@ for test_run in match.test_runs: name = test_run.test.test_id denorm = test_run.denormalization - if denorm.count_pass == denorm.count_all(): + if denorm.count_fail == 0: cls = 'present pass' else: cls = 'present fail' @@ -93,19 +93,18 @@ cls=cls, uuid=test_run.analyzer_assigned_uuid, passes=denorm.count_pass, - total=denorm.count_all(), + total=denorm.count_pass + denorm.count_fail, link=test_run.get_permalink(), bug_ids=bug_ids, ) - if match.tag not in build_number_to_cols: - # This assumes 1 bundle per match... - build_number_to_cols[match.tag] = { + if (match.tag, test_run.bundle.uploaded_on) not in build_number_to_cols: + build_number_to_cols[(match.tag, test_run.bundle.uploaded_on)] = { 'test_runs': {}, 'number': match.tag, 'date': test_run.bundle.uploaded_on, 'link': test_run.bundle.get_absolute_url(), } - build_number_to_cols[match.tag]['test_runs'][name] = test_run_data + build_number_to_cols[(match.tag, test_run.bundle.uploaded_on)]['test_runs'][name] = test_run_data if name != 'lava': test_run_names.add(name)