Merge lp:~doanac/qa-dashboard/smoketestresult-artifacts into lp:qa-dashboard

Proposed by Andy Doan
Status: Merged
Approved by: Chris Johnston
Approved revision: 715
Merged at revision: 715
Proposed branch: lp:~doanac/qa-dashboard/smoketestresult-artifacts
Merge into: lp:qa-dashboard
Diff against target: 24 lines (+2/-5)
1 file modified
smokeng/views.py (+2/-5)
To merge this branch: bzr merge lp:~doanac/qa-dashboard/smoketestresult-artifacts
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+205639@code.launchpad.net

Commit message

filter smoketestresult artifacts properly for mega jobs

The logic was already there, but was only used for SmokeResults

Description of the change

filter smoketestresult artifacts properly for mega jobs

The logic was already there, but was only used for SmokeResults

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'smokeng/views.py'
2--- smokeng/views.py 2014-02-07 19:06:11 +0000
3+++ smokeng/views.py 2014-02-10 18:08:10 +0000
4@@ -495,10 +495,7 @@
5 SmokeTestResult,
6 pk=id,
7 )
8- artifacts = Artifact.objects.filter(
9- jenkins_build=test.result.jenkins_build,
10- ).order_by('name')
11- half = artifacts.count() / 2
12+ artifacts = _result_artifacts(test.result)
13 results = []
14 test_data = dict(
15 command_type=test.command_type,
16@@ -541,7 +538,7 @@
17 'testcase': test.testcase,
18 'artifacts': artifacts,
19 'history': _result_history(test),
20- 'half': half,
21+ 'half': len(artifacts) / 2,
22 'bread_crumb_trail': BreadCrumbTrail.leading_to(
23 test_result_detail,
24 release=release,

Subscribers

People subscribed via source and target branches