Merge lp:~lifeless/ubuntu/lucid/glib2.0/subunit into lp:ubuntu/lucid/glib2.0

[Robert Collins]

This adds a patch approved upstream but pending a release, for use in the dx team test suites.

[lp:~lifeless/ubuntu/lucid/glib2.0/subunit]

48. By Robert Collins on 2010-03-08

Adjust package recommends.

[James Westby (james-w)]

glib2.0 is not going to be under active development going forward,
so seb128 said he isn't going to invest the time in merging this.

Thanks,

James

[Robert Collins (lifeless)]

So where should people put improvements to the gnome testing
infrastructure now ?

[James Westby (james-w)]

On Wed, 04 Aug 2010 00:18:45 -0000, Robert Collins <email address hidden> wrote:
> So where should people put improvements to the gnome testing
> infrastructure now ?

Maybe I misunderstood the comment, so I suggest you contact seb to
discuss it with him.

<seb128> james_w, can you delete the glib2.0 one on
http://qa.ubuntu.com/reports/sponsoring/index.html as well?
<seb128> it's deprecated

Thanks,

James

Unmerged revisions

48. By Robert Collins on 2010-03-08

Adjust package recommends.

47. By Robert Collins on 2010-03-08

Add subunit support to gtester-report.

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-22 15:00:46 +0000
+++ debian/changelog	2010-03-08 08:18:33 +0000
@@ -1,3 +1,9 @@
+glib2.0 (2.23.4-1ubuntu2) lucid; urgency=low
+
+  * Add subunit support to gtester-report.
+
+ -- Robert Collins <[e-mail]>  Mon, 08 Mar 2010 15:58:19 +1100
+
 glib2.0 (2.23.4-1ubuntu1) lucid; urgency=low
 
   * Resync on Debian

=== modified file 'debian/control'
--- debian/control	2010-02-22 15:00:46 +0000
+++ debian/control	2010-03-08 08:18:33 +0000
@@ -66,7 +66,8 @@
          pkg-config (>= 0.14.0),
          zlib1g-dev
 Recommends: python
-Suggests: libglib2.0-doc
+Suggests: libglib2.0-doc,
+        python-subunit
 Replaces: libglib1.3-dev
 Conflicts: libglib1.3-dev
 Description: Development files for the GLib library

=== added file 'debian/patches/80-gtester-subunit.patch'
--- debian/patches/80-gtester-subunit.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/80-gtester-subunit.patch	2010-03-08 08:18:33 +0000
@@ -0,0 +1,247 @@
+# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=611869
+# Description: adds subunit support to gtester-report
+=== modified file 'a/glib/gtester-report'
+--- a/glib/gtester-report	2009-12-19 00:57:03 +0000
++++ b/glib/gtester-report	2010-03-05 04:42:43 +0000
+@@ -17,7 +17,19 @@
+ # License along with this library; if not, write to the
+ # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ # Boston, MA 02111-1307, USA.
++import datetime
++import optparse
+ import sys, re, xml.dom.minidom
++
++try:
++    import subunit
++    from subunit import iso8601
++    from testtools.content import Content, ContentType
++    mime_utf8 = ContentType('text', 'plain', {'charset': 'utf8'})
++except ImportError:
++    subunit = None
++
++
+ pkginstall_configvars = {
+   #@PKGINSTALL_CONFIGVARS_IN24LINES@ # configvars are substituted upon script installation
+ }
+@@ -144,8 +156,25 @@
+       self.last_binary.random_seed = node_as_text (rseed)
+     self.process_children (node)
+ 
+-# HTML report generation class
+-class ReportWriter (TreeProcess):
++
++class ReportWriter(object):
++    """Base class for reporting."""
++
++    def __init__(self, binary_list):
++        self.binaries = binary_list
++
++    def _error_text(node):
++        """Get a string representing the error children of node."""
++        rlist = list_children(node, 'error')
++        txt = ''
++        for enode in rlist:
++            txt += node_as_text (enode)
++            if txt and txt[-1] != '\n':
++                txt += '\n'
++        return txt
++
++
++class HTMLReportWriter(ReportWriter):
+   # Javascript/CSS snippet to toggle element visibility
+   cssjs = r'''
+   <style type="text/css" media="screen">
+@@ -186,9 +215,8 @@
+   }
+   --></script>
+   '''
+-  def __init__ (self, binary_list):
+-    TreeProcess.__init__ (self)
+-    self.binaries = binary_list
++  def __init__(self, binary_list):
++    ReportWriter.__init__(self, binary_list)
+     self.bcounter = 0
+     self.tcounter = 0
+     self.total_tcounter = 0
+@@ -219,12 +247,7 @@
+     self.oprint ('<td>%s %s</td> <td align="right">%s</td> \n' % (html_indent_string (4), path, duration))
+     perflist = list_children (node, 'performance')
+     if result != 'success':
+-      rlist = list_children (node, 'error')
+-      txt = ''
+-      for enode in rlist:
+-        txt += node_as_text (enode)
+-        if txt and txt[-1] != '\n':
+-          txt += '\n'
++      txt = self._error_text(node)
+       txt = re.sub (r'"', r'\\"', txt)
+       txt = re.sub (r'\n', r'\\n', txt)
+       txt = re.sub (r'&', r'&amp;', txt)
+@@ -313,46 +336,132 @@
+     self.oprint ('</body>\n')
+     self.oprint ('</html>\n')
+ 
++
++class SubunitWriter(ReportWriter):
++    """Reporter to output a subunit stream."""
++
++    def printout(self):
++        reporter = subunit.TestProtocolClient(sys.stdout)
++        for binary in self.binaries:
++            for tc in binary.testcases:
++                test = GTestCase(tc, binary)
++                test.run(reporter)
++
++
++class GTestCase(object):
++    """A representation of a gtester test result as a pyunit TestCase."""
++
++    def __init__(self, case, binary):
++        """Create a GTestCase for case `case` from binary program `binary`."""
++        self._case = case
++        self._binary = binary
++        # the name of the case - e.g. /dbusmenu/glib/objects/menuitem/props_boolstr
++        self._path = attribute_as_text(self._case, 'path')
++
++    def id(self):
++        """What test is this? Returns the gtester path for the testcase."""
++        return self._path
++
++    def _get_details(self):
++        """Calculate a details dict for the test - attachments etc."""
++        details = {}
++        result = attribute_as_text(self._case, 'result', 'status')
++        details['filename'] = Content(mime_utf8, lambda:[self._binary.file])
++        details['random_seed'] = Content(mime_utf8,
++            lambda:[self._binary.random_seed])
++        if self._get_outcome() == 'addFailure':
++            # Extract the error details. Skips have no details because its not
++            # skip like unittest does, instead the runner just bypasses N test.
++            txt = self._error_text(self._case)
++            details['error'] = Content(mime_utf8, lambda:[txt])
++        if self._get_outcome() == 'addSuccess':
++            # Sucessful tests may have performance metrics.
++            perflist = list_children(self._case, 'performance')
++            if perflist:
++                presults = []
++                for perf in perflist:
++                    pmin = bool (int (attribute_as_text (perf, 'minimize')))
++                    pmax = bool (int (attribute_as_text (perf, 'maximize')))
++                    pval = float (attribute_as_text (perf, 'value'))
++                    txt = node_as_text (perf)
++                    txt = 'Performance(' + (pmin and 'minimized' or 'maximized'
++                        ) + '): ' + txt.strip() + '\n'
++                    presults += [(pval, txt)]
++                presults.sort()
++                perf_details = [e[1] for e in presults]
++                details['performance'] = Content(mime_utf8, lambda:perf_details)
++        return details
++
++    def _get_outcome(self):
++        if int(attribute_as_text(self._case, 'skipped') + '0'):
++            return 'addSkip'
++        outcome = attribute_as_text(self._case, 'result', 'status')
++        if outcome == 'success':
++            return 'addSuccess'
++        else:
++            return 'addFailure'
++
++    def run(self, result):
++        time = datetime.datetime.utcnow().replace(tzinfo=iso8601.Utc())
++        result.time(time)
++        result.startTest(self)
++        try:
++            outcome = self._get_outcome()
++            details = self._get_details()
++            # Only provide a duration IFF outcome == 'addSuccess' - the main
++            # parser claims bogus results otherwise: in that case emit time as
++            # zero perhaps.
++            if outcome == 'addSuccess':
++                duration = float(node_as_text(self._case, 'duration'))
++                duration = duration * 1000000
++                timedelta = datetime.timedelta(0, 0, duration)
++                time = time + timedelta
++                result.time(time)
++            getattr(result, outcome)(self, details=details)
++        finally:
++            result.stopTest(self)
++
++
++
+ # main program handling
+-def parse_files_and_args ():
+-  from sys import argv, stdin
+-  files = []
+-  arg_iter = sys.argv[1:].__iter__()
+-  rest = len (sys.argv) - 1
+-  for arg in arg_iter:
+-    rest -= 1
+-    if arg == '--help' or arg == '-h':
+-      print_help ()
+-      sys.exit (0)
+-    elif arg == '--version' or arg == '-v':
+-      print_help (False)
+-      sys.exit (0)
+-    else:
+-      files = files + [ arg ]
+-  return files
+-
+-def print_help (with_help = True):
+-  import os
+-  print "gtester-report (GLib utils) version", pkginstall_configvars.get ('glib-version', '0.0-uninstalled')
+-  if not with_help:
+-    return
+-  print "Usage: %s [OPTIONS] <gtester-log.xml>" % os.path.basename (sys.argv[0])
+-  print "Generate HTML reports from the XML log files generated by gtester."
+-  print "Options:"
+-  print "  --help, -h                print this help message"
+-  print "  --version, -v             print version info"
++def parse_opts():
++    """Parse program options.
++
++    :return: An options object and the program arguments.
++    """
++    parser = optparse.OptionParser()
++    parser.version =  pkginstall_configvars.get ('glib-version', '0.0-uninstalled')
++    parser.usage = "%prog [OPTIONS] <gtester-log.xml>"
++    parser.description = "Generate HTML reports from the XML log files generated by gtester."
++    parser.epilog = "gtester-report (GLib utils) version %s."% (parser.version,)
++    parser.add_option("-v", "--version", action="store_true", dest="version", default=False,
++        help="Show program version.")
++    parser.add_option("-s", "--subunit", action="store_true", dest="subunit", default=False,
++        help="Output subunit [See https://launchpad.net/subunit/"
++            " Needs python-subunit]")
++    options, files = parser.parse_args()
++    if options.version:
++        print parser.epilog
++        return None, None
++    if len(files) != 1:
++        parser.error("Must supply a log file to parse.")
++    if options.subunit and subunit is None:
++        parser.error("python-subunit is not installed.")
++    return options, files
++
+ 
+ def main():
+-  from sys import argv, stdin
+-  files = parse_files_and_args()
+-  if len (files) != 1:
+-    print_help (True)
+-    sys.exit (1)
++  options, files = parse_opts()
++  if options is None:
++      return 0
+   xd = xml.dom.minidom.parse (files[0])
+   rr = ReportReader()
+   rr.trampoline (xd)
+-  rw = ReportWriter (rr.binary_list())
+-  rw.printout()
++  if not options.subunit:
++      HTMLReportWriter(rr.binary_list()).printout()
++  else:
++      SubunitWriter(rr.binary_list()).printout()
++        
+ 
+ if __name__ == '__main__':
+   main()
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-02-22 15:00:46 +0000
+++ debian/patches/series	2010-03-08 08:18:33 +0000
@@ -5,3 +5,4 @@
 05-dont-fail-a-couple-of-tests-when-running-as-root.patch
 60_wait-longer-for-threads-to-die.patch
 71_gio_launch_handler.patch
+80-gtester-subunit.patch