Merge lp:~marjo-mercado/ubuntu-qa-tools/bug-735595 into lp:ubuntu-qa-tools

[Marjo F. Mercado]

Added desktop_tests.py and modified run_report.sh and qadashboardutils.py to add Desktop and Alternate image test results to qadashboard.
Implements bug # 735595

How To Test
1. Run report.sh
2. Check that the generated html file includes the link for the Desktop and Alternate test results at: http://204.236.234.12:8080/view/natty-desktop/
3. Check for some failures (Red status in QA Dashboard) and no failures (Green status)

[Kees Cook (kees)]

Hi, please don't use "(s)". Since the quantity is known, just use correct pluralization.

For example, instead of:
   status = "%d failure(s)" % failures

use:
   status = "%d failure%s" % (failures, '' if failures == 1 else 's')

[lp:~marjo-mercado/ubuntu-qa-tools/bug-735595]

535. By Marjo F. Mercado on 2011-03-15

Modified server_tests.py & desktop_tests.py to not use "(s)", per Kees Cook suggestion.

[Kees Cook (kees)]

Cool, thanks! :)

[Brian Murray (brian-murray)]

I removed a couple of unused sys imports but otherwise it looked good thanks!

review: Approve

=== added file 'qadashboard/desktop_tests.py'
--- qadashboard/desktop_tests.py	1970-01-01 00:00:00 +0000
+++ qadashboard/desktop_tests.py	2011-03-15 21:21:01 +0000
@@ -0,0 +1,48 @@
+#!/usr/bin/python
+# This script creates the data to be used for reporting on
+# the automated Desktop and Alternate image tests.
+# It is based on the ubuntu weatherreport from Leann Ogasawara.
+#
+# Copyright 2011  Canonical, Ltd.
+# Author: Marjo Mercado <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+# the full text of the license.
+
+from qadashboard_utils import *
+import subprocess
+import sys
+import re
+
+def desktop_tests():
+    # Setup for writing to the data file
+    metric = "Desktop and Alternate Images Automated Tests Results"
+    data = ""
+    status = "Testing In Progress"
+    url="http://204.236.234.12:8080/view/natty-desktop"
+    prc = subprocess.Popen(['wget', '--output-document=-', url],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE)
+    (stdout, stderr) = prc.communicate()
+    failures = 0
+    pattern = re.compile('tooltip="Failed"')
+    for line in stdout.splitlines():
+        if pattern.search(line):
+            failures += 1
+    if failures == 0:
+        color = GREEN
+        status = "No failures"
+    else:
+        color = RED
+        status = "%d failure%s" % (failures, '' if failures == 1 else 's')
+
+
+    # Note: The name of the metric must not contain spaces
+    data = "desktop_automated_tests: metric=\"%s\" color=\"%s\" url=\"%s\" status=\"%s\"" % (metric, color, url, status)
+    create_file(DESKTOP_TESTS_FILE, data)
+
+desktop_tests()
+

=== modified file 'qadashboard/qadashboard_utils.py'
--- qadashboard/qadashboard_utils.py	2011-02-14 17:21:47 +0000
+++ qadashboard/qadashboard_utils.py	2011-03-15 21:21:01 +0000
@@ -3,7 +3,7 @@
 # scripts.
 # It is based on the ubuntu weatherreport from Leann Ogasawara.
 #
-# Copyright 2010  Canonical, Ltd.
+# Copyright 2010-2011  Canonical, Ltd.
 # Author: Marjo Mercado <[e-mail]>
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -68,7 +68,8 @@
          "iso_testing.txt",
          "automatic_upgrades.txt",
          "mago_tests.txt",
-         "server_tests.txt"]
+         "server_tests.txt",
+         "desktop_tests.txt"]
 
 BUGS_MOST_USERS_AFFECTED_FILE = DATA_DIR + "bugs_most_users_affected.txt"
 BUGS_MOST_DUPLICATES_FILE = DATA_DIR + "bugs_most_duplicates.txt"
@@ -81,6 +82,7 @@
 MAGO_TESTS_FILE = DATA_DIR + "mago_tests.txt"
 MAGO_UNITY_TESTS_FILE = DATA_DIR + "mago_unity_tests.txt"
 SERVER_TESTS_FILE = DATA_DIR + "server_tests.txt"
+DESKTOP_TESTS_FILE = DATA_DIR + "desktop_tests.txt"
 
 def parse_url(url, reg_exp):
     content = urllib2.urlopen(url).read()

=== modified file 'qadashboard/run_report.sh'
--- qadashboard/run_report.sh	2011-03-10 17:40:58 +0000
+++ qadashboard/run_report.sh	2011-03-15 21:21:01 +0000
@@ -2,7 +2,7 @@
 # This shell scripts runs the individual python scripts and publishes the
 # qadashboard web page
 # 
-# Copyright 2010  Canonical, Ltd.
+# Copyright 2010-2011  Canonical, Ltd.
 # Author: Marjo Mercado <[e-mail]>
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -43,6 +43,8 @@
 python mago_tests.py
 echo "Running server tests"
 python server_tests.py
+echo "Running desktop tests"
+python desktop_tests.py
 
 # Data must be generated for the web page to change
 echo "Generating data"

=== modified file 'qadashboard/server_tests.py'
--- qadashboard/server_tests.py	2010-11-30 04:55:28 +0000
+++ qadashboard/server_tests.py	2011-03-15 21:21:01 +0000
@@ -37,8 +37,7 @@
         status = "No failures"
     else:
         color = RED
-        status = "%d failure(s)" % failures
-
+        status = "%d failure%s" % (failures, '' if failures == 1 else 's')
 
     # Note: The name of the metric must not contain spaces
     data = "server_automated_tests: metric=\"%s\" color=\"%s\" url=\"%s\" status=\"%s\"" % (metric, color, url, status)