Merge lp:~marjo-mercado/ubuntu-qa-tools/hw-cert-change into lp:ubuntu-qa-tools

Proposed by Marjo F. Mercado
Status: Merged
Approved by: Brian Murray
Approved revision: 465
Merge reported by: Steve Beattie
Merged at revision: not available
Proposed branch: lp:~marjo-mercado/ubuntu-qa-tools/hw-cert-change
Merge into: lp:ubuntu-qa-tools
Diff against target: 27 lines (+6/-2)
1 file modified
qadashboard/hw_cert.py (+6/-2)
To merge this branch: bzr merge lp:~marjo-mercado/ubuntu-qa-tools/hw-cert-change
Reviewer Review Type Date Requested Status
Steve Beattie Approve
Brian Murray Pending
Review via email: mp+43368@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Steve Beattie (sbeattie) wrote :

Was merged (commit 466), marking approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qadashboard/hw_cert.py'
2--- qadashboard/hw_cert.py 2010-12-03 23:32:02 +0000
3+++ qadashboard/hw_cert.py 2010-12-10 16:34:14 +0000
4@@ -11,18 +11,22 @@
5 # Free Software Foundation; either version 2 of the License, or (at your
6 # option) any later version. See http://www.gnu.org/copyleft/gpl.html for
7 # the full text of the license.
8+#
9+# Modification History
10+# 10 December 2010 - Marjo Mercado
11+# Changed url to http://people.canonical.com/~hwcert/hw-testing/current.html
12
13 from qadashboard_utils import *
14
15 def hw_cert():
16 metric = "Hardware Certification Lab Test Results"
17 color = ""
18- url = "http://people.ubuntu.com/~fader/hw-testing/status"
19+ url = "http://people.canonical.com/~hwcert/hw-testing/status"
20 status = ""
21 status = urllib2.urlopen(url).read()
22 status = status.strip()
23 status = status.replace("\n", ", ")
24- url = "http://people.canonical.com/~ara/hw-testing/current.html"
25+ url = "http://people.canonical.com/~hwcert/hw-testing/current.html"
26 data = "hw_cert: metric=\"%s\" color=\"%s\" url=\"%s\" status=\"%s\"" % (metric, color, url, status)
27 create_file(HW_CERT_FILE, data)
28